| From 9f743d7499bc2c4dc8c35af33bdb2a29bea663b9 Mon Sep 17 00:00:00 2001 |
| From: Johan Hedberg <johan.hedberg@intel.com> |
| Date: Thu, 17 Jul 2014 11:56:33 +0300 |
| Subject: Bluetooth: Fix using uninitialized variable when pairing |
| |
| From: Johan Hedberg <johan.hedberg@intel.com> |
| |
| commit 9f743d7499bc2c4dc8c35af33bdb2a29bea663b9 upstream. |
| |
| Commit 6c53823ae0e10e723131055e1e65dd6a328a228e reshuffled the way the |
| authentication requirement gets set in the hci_io_capa_request_evt() |
| function, but at the same time it failed to update an if-statement where |
| cp.authentication is used before it has been initialized. The correct |
| value the code should be looking for in this if-statement is |
| conn->auth_type. |
| |
| Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> |
| Signed-off-by: Marcel Holtmann <marcel@holtmann.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| net/bluetooth/hci_event.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/bluetooth/hci_event.c |
| +++ b/net/bluetooth/hci_event.c |
| @@ -3542,7 +3542,7 @@ static void hci_io_capa_request_evt(stru |
| * except for the no-bonding case. |
| */ |
| if (conn->io_capability != HCI_IO_NO_INPUT_OUTPUT && |
| - cp.authentication != HCI_AT_NO_BONDING) |
| + conn->auth_type != HCI_AT_NO_BONDING) |
| conn->auth_type |= 0x01; |
| |
| cp.authentication = conn->auth_type; |
