diff options
| author | Loic Poulain <loic.poulain@intel.com> | 2014-06-23 17:42:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-28 08:00:02 -0700 |
| commit | 18d8867933b9df6b51afa3b5694d82dd88bb46e2 (patch) | |
| tree | fa9b47289f8cc0eb8f84adc3418a4cea9189684d /drivers/bluetooth | |
| parent | 9ac5d53ca3d2c5b849a57227cc5b0c958692cfdb (diff) | |
| download | linux-3.10-18d8867933b9df6b51afa3b5694d82dd88bb46e2.tar.gz linux-3.10-18d8867933b9df6b51afa3b5694d82dd88bb46e2.tar.bz2 linux-3.10-18d8867933b9df6b51afa3b5694d82dd88bb46e2.zip | |
Bluetooth: Ignore H5 non-link packets in non-active state
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>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/hci_h5.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c index b6154d5a07a..db0be2fb05f 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; |