Commit 48439d50 authored Jun 23, 2014 by Loic Poulain Committed by Marcel Holtmann Jun 23, 2014

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

parent 1d56dc4f

drivers/bluetooth/hci_h5.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;