From nobody Tue Apr 14 13:59:20 2026 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3B242DC32C for ; Tue, 14 Apr 2026 05:24:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776144256; cv=none; b=Ynn4MTdEFfR7a8vTXrmAFLKta9x3kyuBMVOkN5pYMeYt44/A8FSvES+8KRRRyx1g8+bM03DygzjtWoYvtuGJExc2TUk1wsDpqbs+eMmYjmMrfijV6c1pGufF4yDWU/15gBOLqutB1EsG47qr2XbVgqog1Dhx+UrpU+jytFxpVjQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776144256; c=relaxed/simple; bh=E6WjbmEWe+S34PTulf60T6Wo7hTAM58aLyy7z6p2nBM=; h=Content-Type:MIME-Version:From:To:Cc:Subject:Date:Message-ID; b=X2InuGlRROm31DmLQ0mG15m6ssP0y4cjVs0oFIbXw63D4Am1ab/3BEQxY9DYsxDIhhwjv65B8X19XCfDlBPMmjWi4NlDsfDLaWeXen8if97IPp8BF0e9EiRZ9aHgqV/0zfEOqB0Kcny2WMrRFJW+z1gBT5DSc+Kj0JHZqzRuSJ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AmxLPpW/; arc=none smtp.client-ip=209.85.222.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AmxLPpW/" Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-8d583bfc415so813051885a.2 for ; Mon, 13 Apr 2026 22:24:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776144252; x=1776749052; darn=vger.kernel.org; h=message-id:date:subject:cc:to:from:content-transfer-encoding :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=E6WjbmEWe+S34PTulf60T6Wo7hTAM58aLyy7z6p2nBM=; b=AmxLPpW/4BVzW0I3iAP3Q5wAc+XXWANRmMQ71fz05NGugVmhS6kDCB5qD4+x4/KVXC DvMUd/o9x2Y03y6fADY+3xNJkGcu23JGevxWzySVMg2/Aat87iJ16ZH6tqeGgtI30Tu7 pqXjAS/gwKsNB1N42y0Roysbi7UhjUetJuVjimlp7noVR/+K1/YJjKM7KN1SIQ7O1kWF cfqyo3NMyY8Ig/FUDjGu/BlodwEQXT6E2cdru7W2HyELkYiZwO8PQefsYbJcwYJTUClB ZFUiZilOY/9syKUHVaf38IJOFIyhSQU82gfWiO66v2bZrGz9JKuj/pOqgEpt3dZ1ELTp lEdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776144252; x=1776749052; h=message-id:date:subject:cc:to:from:content-transfer-encoding :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=E6WjbmEWe+S34PTulf60T6Wo7hTAM58aLyy7z6p2nBM=; b=hpRCqAewSiAlDWs5VLjhoCteU+au1Xc78VnLbe3O09AsUIBgXNX6+pFI99/W5OM+UU /jvPR8FmMS5QeO7H5LEe234akkgXQ74eJojkTnq6SuO0S5e+f2yNvtXdMjokbFTkvvro kaCmMTH4fc0E1WwHcatbiy/NOrQkl6jpfjUecc04XDPxwB0cQK3rRdy+hwrh63Mt2uHc LBRCF5c1xpLHVcwKBETD58nwcV5IG7cM7jgZhBI8NGG3CHU8RSrkNe1icACYucHax5Ya nFfAjz56KRQaxmxpEI/gYag2LZ5T56e8QYYfSrlDVkk/y9MJK1rSPCFrZQoK4HRgIsKZ jkiQ== X-Forwarded-Encrypted: i=1; AFNElJ+hUj+w16J9DvRHFzIpHzCzrkPblZlsgFq+uRM/df+pLPacSpplNX7MuGEy74u36ZJlJ49gjWevlsZiqOo=@vger.kernel.org X-Gm-Message-State: AOJu0YzBtT0kcp4oO+AYEWpBdIdUFML8pCMYp4K10Ad/F9NMTL2/5Gn8 2angvgTfSWwC5/3bVbwRuRYZiaKwQ9MdElPf+Z3oW2awTX6eeAk/arTN X-Gm-Gg: AeBDieucf4tdRG+IMUTHUvRRD+f7tkgqK89vUEoEGzUEEAiuy7cxwhNkUF0DSAX7zUz UAmvDRtHcmw+zcohM3wqOl6WkKTtWItjMTRpfgghNp1+XFwUn82hC5UWpwqSehkJ80BuAqldcWU j+3A84+HudEk148crGlIW2fqcWJayYKCgl7+i5sVHV0/EbfoaLFLTZ5Dmm7Z0yW2INIq0THUuH3 ngTuWAwDieMGYByvfrRPxxvvvSD82RCuJYdwsYj2+iCPyFI3NhFY/bDvogZnkqQF9L19/vuDJbH RtogPscDJ4k4Od4rn41WXO+gldGQjW92kmxslG7u88PqT/NCBeNoKlJGC1NeozTb/POvSoqKLR4 W7ev4FDBMGSxVVKKYn08geOAUbhckIxYh4YrVMKgdiu2UJ5JtlohwbsxUVfvm75gNlK7mTt1p6o AGqxmFAeOlQtKVUCj82QH3aYhsa/RzsqUoQGtj5EOwhbzbgz02Y9YILd2Nu4vOQC4eNG2q1d8= X-Received: by 2002:a05:620a:4112:b0:8d6:9e5c:36c with SMTP id af79cd13be357-8ddcd40a515mr2258927385a.6.1776144252505; Mon, 13 Apr 2026 22:24:12 -0700 (PDT) Received: from tdc4045031631.internal.cloudapp.net ([20.63.37.123]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8deb5d9b336sm828868285a.9.2026.04.13.22.24.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2026 22:24:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Ashutosh Desai To: netdev@vger.kernel.org Cc: kuba@kernel.org, edumazet@google.com, davem@davemloft.net, pabeni@redhat.com, horms@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4] nfc: hci: fix out-of-bounds read in HCP header parsing Date: Tue, 14 Apr 2026 05:24:10 -0000 Message-ID: <177614425081.3600288.2536320552978506086@gmail.com> nfc_hci_recv_from_llc() and nci_hci_data_received_cb() cast skb->data to struct hcp_packet and read the message header byte without checking that enough data is present in the linear sk_buff area. A malicious NFC peer can send a 1-byte HCP frame that passes through the SHDLC layer and reaches these functions, causing an out-of-bounds heap read. Fix this by adding pskb_may_pull() before each cast to ensure the full 2-byte HCP header is pulled into the linear area before it is accessed. Fixes: 8b8d2e08bf0d ("NFC: HCI support") Fixes: 11f54f228643 ("NFC: nci: Add HCI over NCI protocol support") Cc: stable@vger.kernel.org Signed-off-by: Ashutosh Desai --- V3 -> V4: add Fixes tags V2 -> V3: drop redundant checks from nfc_hci_msg_rx_work/nci_hci_msg_rx_wor= k, remove incorrect Suggested-by tag V1 -> V2: switch skb->len check to pskb_may_pull v3: https://lore.kernel.org/netdev/20260413024329.3293075-1-ashutoshdesai99= 3@gmail.com/ v2: https://lore.kernel.org/netdev/20260409150825.2217133-1-ashutoshdesai99= 3@gmail.com/ v1: https://lore.kernel.org/netdev/20260408223113.2009304-1-ashutoshdesai99= 3@gmail.com/ net/nfc/hci/core.c | 5 +++++ net/nfc/nci/hci.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c index 0d33c81a15fe..cd9cf6c94a50 100644 --- a/net/nfc/hci/core.c +++ b/net/nfc/hci/core.c @@ -904,6 +904,11 @@ static void nfc_hci_recv_from_llc(struct nfc_hci_dev *= hdev, struct sk_buff *skb) * unblock waiting cmd context. Otherwise, enqueue to dispatch * in separate context where handler can also execute command. */ +if (!pskb_may_pull(hcp_skb, NFC_HCI_HCP_HEADER_LEN)) { +kfree_skb(hcp_skb); +return; +} + packet =3D (struct hcp_packet *)hcp_skb->data; type =3D HCP_MSG_GET_TYPE(packet->message.header); if (type =3D=3D NFC_HCI_HCP_RESPONSE) { diff --git a/net/nfc/nci/hci.c b/net/nfc/nci/hci.c index 40ae8e5a7ec7..6e633da257d1 100644 --- a/net/nfc/nci/hci.c +++ b/net/nfc/nci/hci.c @@ -482,6 +482,11 @@ void nci_hci_data_received_cb(void *context, * unblock waiting cmd context. Otherwise, enqueue to dispatch * in separate context where handler can also execute command. */ +if (!pskb_may_pull(hcp_skb, NCI_HCI_HCP_HEADER_LEN)) { +kfree_skb(hcp_skb); +return; +} + packet =3D (struct nci_hcp_packet *)hcp_skb->data; type =3D NCI_HCP_MSG_GET_TYPE(packet->message.header); if (type =3D=3D NCI_HCI_HCP_RESPONSE) { --=20 2.34.1