From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1716A226546; Thu, 12 Dec 2024 16:34:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734021276; cv=none; b=EhJ7l8mQ88mthEyvf64acNyI0qIWr08ymn1kbqw1C9wAgjYMpfQDGrDUd1aIpyFeQuxlX/JFjl1pgMDfl3oKSvz/4YAXmQtIHXKUOxK8y/wiEwakpO3EKYfJbEY3ZlkpcIODm6kef3LnXFSyWVSIyhXQCZfGfZovs/ePRsV01ME= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734021276; c=relaxed/simple; bh=c0HRC9RwF0oiaohAq3hQr452pUMiBxKZOECm3CXJGLs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A7j2Ot7pJwTRmrt/ZXEP3DULbdZ4RN0WrZoMpgv3loAV6q1f7dhI7W7V1PClBlRRQFeOFJPgXY6LN7qccdTTDFhAfQ4m0OjIcVdZriODNXKcCSRIym8IToR6GWHiF88dKo60sP4TTmU6r9BRcv136+Vo2Pvoc+zkvLLMtnhV060= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lxuCNETM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lxuCNETM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECBCBC4CECE; Thu, 12 Dec 2024 16:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734021275; bh=c0HRC9RwF0oiaohAq3hQr452pUMiBxKZOECm3CXJGLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lxuCNETMel0A7zehH64n9aJH27abFnlQQXI7LZN5NS6ZyVc+W++DfyN0FO5hGd0+7 4jr/UBgo7ZUp8Qj7X6VYqjgfBDhJT0RL2tU8bnFeIdUofk06giBj5E912YLJt0pTwv W9PJ9IwDeMF2hH3F50eBpA0jLcW/ICyrq5HzYgEU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+6ea290ba76d8c1eb1ac2@syzkaller.appspotmail.com, Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.1 694/772] Bluetooth: hci_core: Fix not checking skb length on hci_acldata_packet Date: Thu, 12 Dec 2024 16:00:39 +0100 Message-ID: <20241212144418.585961783@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144349.797589255@linuxfoundation.org> References: <20241212144349.797589255@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luiz Augusto von Dentz [ Upstream commit 3fe288a8214e7dd784d1f9b7c9e448244d316b47 ] This fixes not checking if skb really contains an ACL header otherwise the code may attempt to access some uninitilized/invalid memory past the valid skb->data. Reported-by: syzbot+6ea290ba76d8c1eb1ac2@syzkaller.appspotmail.com Tested-by: syzbot+6ea290ba76d8c1eb1ac2@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=6ea290ba76d8c1eb1ac2 Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- net/bluetooth/hci_core.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 789f7f4a09089..3cd7c212375fc 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -3829,18 +3829,22 @@ static void hci_tx_work(struct work_struct *work) /* ACL data packet */ static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) { - struct hci_acl_hdr *hdr = (void *) skb->data; + struct hci_acl_hdr *hdr; struct hci_conn *conn; __u16 handle, flags; - skb_pull(skb, HCI_ACL_HDR_SIZE); + hdr = skb_pull_data(skb, sizeof(*hdr)); + if (!hdr) { + bt_dev_err(hdev, "ACL packet too small"); + goto drop; + } handle = __le16_to_cpu(hdr->handle); flags = hci_flags(handle); handle = hci_handle(handle); - BT_DBG("%s len %d handle 0x%4.4x flags 0x%4.4x", hdev->name, skb->len, - handle, flags); + bt_dev_dbg(hdev, "len %d handle 0x%4.4x flags 0x%4.4x", skb->len, + handle, flags); hdev->stat.acl_rx++; @@ -3859,6 +3863,7 @@ static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) handle); } +drop: kfree_skb(skb); } -- 2.43.0