diff options
| author |   Johan Hedberg <johan.hedberg@intel.com> | 2014-07-17 11:56:33 +0300 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2014-07-17 11:38:00 +0200 |
| commit | 9f743d7499bc2c4dc8c35af33bdb2a29bea663b9 (patch) | |
| tree | a95e80a3d94cab6502b592e2c4be515bc19279bc /net/bluetooth | |
| parent | Bluetooth: Fix always checking the blacklist for incoming connections (diff) | |
| download | linux-dev-9f743d7499bc2c4dc8c35af33bdb2a29bea663b9.tar.xz linux-dev-9f743d7499bc2c4dc8c35af33bdb2a29bea663b9.zip | |
Bluetooth: Fix using uninitialized variable when pairing
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>
Cc: stable@vger.kernel.org # 3.16
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index cae860b02d67..1ac526022ad9 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3658,7 +3658,7 @@ static void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff *skb) * 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; |