From: Johan Hedberg Date: Fri, 5 Sep 2014 19:19:49 +0000 (+0300) Subject: Bluetooth: Don't take any action in smp_resume_cb if not encrypted X-Git-Tag: v4.9.8~5486^2~75^2~210 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84bc0db53b3a425fb992d5fed25b575e4434167a;p=platform%2Fkernel%2Flinux-rpi3.git Bluetooth: Don't take any action in smp_resume_cb if not encrypted When smp_resume_cb is called if we're not encrypted (i.e. the callback wasn't called because the connection became encrypted) we shouldn't take any action at all. This patch moves also the security_timer cancellation behind this condition. Signed-off-by: Johan Hedberg Signed-off-by: Marcel Holtmann --- diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index b8ecc7b..9accb47 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -1533,10 +1533,12 @@ static void smp_resume_cb(struct l2cap_chan *chan) if (!smp) return; + if (!test_bit(HCI_CONN_ENCRYPT, &hcon->flags)) + return; + cancel_delayed_work(&smp->security_timer); - if (test_bit(HCI_CONN_ENCRYPT, &hcon->flags)) - queue_work(hdev->workqueue, &smp->distribute_work); + queue_work(hdev->workqueue, &smp->distribute_work); } static void smp_ready_cb(struct l2cap_chan *chan)