Return-Path: From: Loic Poulain To: marcel@holtmann.org, johan.hedberg@gmail.com, gustavo@padovan.org Cc: linux-bluetooth@vger.kernel.org, stable@vger.kernel.org, Loic Poulain Subject: [PATCHv2] Bluetooth: Ignore H5 non-link packets in non-active state Date: Mon, 23 Jun 2014 17:42:44 +0200 Message-Id: <1403538164-11505-1-git-send-email-loic.poulain@intel.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: 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 --- v2: commit message update (pointer deref) drivers/bluetooth/hci_h5.c | 1 + 1 file changed, 1 insertion(+) 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; -- 1.8.3.2