[PATCH] Bluetooth: Fix OOB data present value for SMP pairing

[PATCH] Bluetooth: Fix OOB data present value for SMP pairing

[Marcel Holtmann]

Before setting the OOB data present flag with SMP pairing, check the
newly introduced present tracking that actual OOB data values have
been provided. The existence of remote OOB data structure does not
actually mean that the correct data values are available.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
 net/bluetooth/smp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 37d9180bfe1c..c09a821f381d 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -620,7 +620,7 @@ static void build_pairing_cmd(struct l2cap_conn *conn,
 
 		oob_data = hci_find_remote_oob_data(hdev, &hcon->dst,
 						    bdaddr_type);
-		if (oob_data) {
+		if (oob_data && oob_data->present) {
 			set_bit(SMP_FLAG_OOB, &smp->flags);
 			oob_flag = SMP_OOB_PRESENT;
 			memcpy(smp->rr, oob_data->rand256, 16);
-- 
2.1.0

Re: [PATCH] Bluetooth: Fix OOB data present value for SMP pairing

[Johan Hedberg]

Hi Marcel,

On Sat, Jan 31, 2015, Marcel Holtmann wrote:
> Before setting the OOB data present flag with SMP pairing, check the
> newly introduced present tracking that actual OOB data values have
> been provided. The existence of remote OOB data structure does not
> actually mean that the correct data values are available.
> 
> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
> ---
>  net/bluetooth/smp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to bluetooth-next. Thanks.

Johan