summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorLoic Poulain <loic.poulain@intel.com>2014-06-23 17:42:44 +0200
committerMarcel Holtmann <marcel@holtmann.org>2014-06-23 18:22:48 +0200
commit48439d501e3d9e8634bdc0c418e066870039599d (patch)
tree156194aaaa8cb08115ad44c41d925a72dc8053ad /drivers/bluetooth
parent1d56dc4f5f7cdf0ba99062d974b7586a28fc5cf4 (diff)
downloadop-kernel-dev-48439d501e3d9e8634bdc0c418e066870039599d.zip
op-kernel-dev-48439d501e3d9e8634bdc0c418e066870039599d.tar.gz
Bluetooth: Ignore H5 non-link packets in non-active state
When detecting a non-link packet, h5_reset_rx() frees the Rx skb. Not returning after that will cause the upcoming h5_rx_payload() call to dereference a now NULL Rx skb and trigger a kernel oops. Signed-off-by: Loic Poulain <loic.poulain@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/hci_h5.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index 04680ea..fede8ca 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -406,6 +406,7 @@ static int h5_rx_3wire_hdr(struct hci_uart *hu, unsigned char c)
H5_HDR_PKT_TYPE(hdr) != HCI_3WIRE_LINK_PKT) {
BT_ERR("Non-link packet received in non-active state");
h5_reset_rx(h5);
+ return 0;
}
h5->rx_func = h5_rx_payload;
OpenPOWER on IntegriCloud