[AUTOSEL,for,4.9,153/190] Bluetooth: btqcomsmd: Fix skb double free corruption

Message ID 20180308045810.8041-153-alexander.levin@microsoft.com
State New
Headers show
  • Untitled series #9855
Related show

Commit Message

Sasha Levin March 8, 2018, 4:59 a.m.
From: Loic Poulain <loic.poulain@linaro.org>

[ Upstream commit 67b8fbead4685b36d290a0ef91c6ddffc4920ec9 ]

In case of hci send frame failure, skb is still owned
by the caller (hci_core) and then should not be freed.

This fixes crash on dragonboard-410c when sending SCO
packet. skb is freed by both btqcomsmd and hci_core.

Fixes: 1511cc750c3d ("Bluetooth: Introduce Qualcomm WCNSS SMD based HCI driver")
Signed-off-by: Loic Poulain <loic.poulain@linaro.org>

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>

 drivers/bluetooth/btqcomsmd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c
index 08c2c93887c1..3aac78a5091b 100644
--- a/drivers/bluetooth/btqcomsmd.c
+++ b/drivers/bluetooth/btqcomsmd.c
@@ -85,7 +85,8 @@  static int btqcomsmd_send(struct hci_dev *hdev, struct sk_buff *skb)
-	kfree_skb(skb);
+	if (!ret)
+		kfree_skb(skb);
 	return ret;