]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Bluetooth: Remove OOB data if device was discovered in band
authorSzymon Janc <szymon.janc@tieto.com>
Tue, 20 Nov 2012 10:38:54 +0000 (11:38 +0100)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Tue, 20 Nov 2012 18:03:15 +0000 (16:03 -0200)
OOB authentication mechanism should be used only if pairing process
has been activated by previous OOB information exchange (Core Spec
4.0 , vol. 1, Part A, 5.1.4.3). Stored OOB data for specific device
should be removed if that device was discovered in band later on.

Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Acked-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
net/bluetooth/hci_core.c

index e3a49db9cfcb4a17cb68287838a0de531abb7508..81f4bac098c9b5210125d72b334bc5c249d3bee5 100644 (file)
@@ -434,6 +434,8 @@ bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data,
 
        BT_DBG("cache %p, %pMR", cache, &data->bdaddr);
 
+       hci_remove_remote_oob_data(hdev, &data->bdaddr);
+
        if (ssp)
                *ssp = data->ssp_mode;