diff mbox series

[AUTOSEL,for,4.14,02/67] Bluetooth: btqcomsmd: Fix skb double free corruption

Message ID 20180308045641.7814-2-alexander.levin@microsoft.com
State New
Headers show
Series [AUTOSEL,for,4.14,01/67] Bluetooth: hci_qca: Avoid setup failure on missing rampatch | expand

Commit Message

Sasha Levin March 8, 2018, 4:57 a.m. UTC 
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(-)

-- 
2.14.1
diff mbox series

Patch

diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c
index bd810d01538a..093fd096f0c8 100644
--- a/drivers/bluetooth/btqcomsmd.c
+++ b/drivers/bluetooth/btqcomsmd.c
@@ -86,7 +86,8 @@  static int btqcomsmd_send(struct hci_dev *hdev, struct sk_buff *skb)
 		break;
 	}
 
-	kfree_skb(skb);
+	if (!ret)
+		kfree_skb(skb);
 
 	return ret;
 }