| From 48439d501e3d9e8634bdc0c418e066870039599d Mon Sep 17 00:00:00 2001 |
| From: Loic Poulain <loic.poulain@intel.com> |
| Date: Mon, 23 Jun 2014 17:42:44 +0200 |
| Subject: Bluetooth: Ignore H5 non-link packets in non-active state |
| |
| From: Loic Poulain <loic.poulain@intel.com> |
| |
| commit 48439d501e3d9e8634bdc0c418e066870039599d upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/bluetooth/hci_h5.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/drivers/bluetooth/hci_h5.c |
| +++ b/drivers/bluetooth/hci_h5.c |
| @@ -406,6 +406,7 @@ static int h5_rx_3wire_hdr(struct hci_ua |
| 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; |
