From nobody Fri Jul 24 05:22:04 2026 Received: from cstnet.cn (smtp81.cstnet.cn [159.226.251.81]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 610DD31283E; Thu, 23 Jul 2026 02:37:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784774258; cv=none; b=pqzoc30kXaSdcSJzokg+p8LelvfX1bkB878SNbpOmNLWr/IboODaVzkiBbbLib10hooKGlEvr2r2R0OsH+o3un9m+5y+X6sZRmZRzxE+lGV2qqOeKdnOi5rfDi/Slti+5erxLijNIXJ9bsrApIebXAtTGo/YqcG7T0aFN0oEDa4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784774258; c=relaxed/simple; bh=lid5kxsIMgcEtxzhBYpQYSfxTwT7y9sBncibvjK+hM4=; h=From:To:Cc:Subject:Date:Message-ID:Content-Type:MIME-Version; b=UGtgNV2g+SxxwwPJWdC+yOioq88jg2irmNzAe+daCko1lgEGlFelgFJFgRpXEIMHEseYqce2KxbB/j+vV4pklflZmIRFj5uU+yPjug94ldIZHpZF4zqj3/hVyx5RrFthDcAUuMBCzlccWv7WMOGBKEXD/BbosjB7qIC/HTXx2T8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn; spf=pass smtp.mailfrom=iscas.ac.cn; arc=none smtp.client-ip=159.226.251.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from localhost.localdomain (unknown [111.196.241.250]) by APP-03 (Coremail) with SMTP id rQCowAA3Pz1hfmFq4XLWAA--.34984S2; Thu, 23 Jul 2026 10:37:21 +0800 (CST) From: Pengpeng Hou To: David Heidelberg Cc: Kees Cook , Doruk Tan Ozturk , oe-linux-nfc@lists.linux.dev, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Pengpeng Hou Subject: [PATCH v2] nfc: microread: validate target discovery payload lengths Date: Thu, 23 Jul 2026 10:37:20 +0800 Message-ID: <20260723103508.1-microread-v2-pengpeng@iscas.ac.cn> X-Mailer: git-send-email 2.50.1 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 X-CM-TRANSID: rQCowAA3Pz1hfmFq4XLWAA--.34984S2 X-Coremail-Antispam: 1UD129KBjvJXoWxJFyrZrWkKFW3uF17tF4xJFb_yoWrGF15pa yUWr1DKrW5JrW7Gw13ZFn7Zr1UJw4xuwsF9F1xJwsaya1Yk34DJas3Wa42vF4UAFy5ZrW2 kr1vv39xGa9rAa7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkK14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr 1j6F4UJwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv 7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r 1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY1x0262kKe7AK xVWUAVWUtwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F4 0E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1l IxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxV AFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j 6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7VU18sqt UUUUU== X-CM-SenderInfo: pshqw1xhqjqxpvfd2hldfou0/ microread_target_discovered() parses target discovery payloads from skb->data according to the HCI gate. The fixed field offsets and UID copies were checked only against the destination nfc_target buffers, not against the actual skb length. Validate that each gate-specific payload contains the fixed fields and UID bytes before reading or copying them. Fixes: cfad1ba87150 ("NFC: Initial support for Inside Secure microread") Cc: stable@vger.kernel.org Signed-off-by: Pengpeng Hou --- Changes since v1: https://lore.kernel.org/all/20260701053709.45176-1-pengpe= ng@iscas.ac.cn/ - add the Fixes tag and stable Cc requested during review - rebase onto the current net tree drivers/nfc/microread/microread.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/drivers/nfc/microread/microread.c b/drivers/nfc/microread/micr= oread.c index 4149c5d735bd..dfa2490db545 100644 --- a/drivers/nfc/microread/microread.c +++ b/drivers/nfc/microread/microread.c @@ -483,13 +483,19 @@ static void microread_target_discovered(struct nfc_hc= i_dev *hdev, u8 gate, =20 switch (gate) { case MICROREAD_GATE_ID_MREAD_ISO_A: + if (skb->len <=3D MICROREAD_EMCF_A_LEN) { + r =3D -EINVAL; + goto exit_free; + } + targets->supported_protocols =3D nfc_hci_sak_to_protocol(skb->data[MICROREAD_EMCF_A_SAK]); targets->sens_res =3D be16_to_cpu(*(u16 *)&skb->data[MICROREAD_EMCF_A_ATQA]); targets->sel_res =3D skb->data[MICROREAD_EMCF_A_SAK]; targets->nfcid1_len =3D skb->data[MICROREAD_EMCF_A_LEN]; - if (targets->nfcid1_len > sizeof(targets->nfcid1)) { + if (targets->nfcid1_len > sizeof(targets->nfcid1) || + targets->nfcid1_len > skb->len - MICROREAD_EMCF_A_UID) { r =3D -EINVAL; goto exit_free; } @@ -497,13 +503,19 @@ static void microread_target_discovered(struct nfc_hc= i_dev *hdev, u8 gate, targets->nfcid1_len); break; case MICROREAD_GATE_ID_MREAD_ISO_A_3: + if (skb->len <=3D MICROREAD_EMCF_A3_LEN) { + r =3D -EINVAL; + goto exit_free; + } + targets->supported_protocols =3D nfc_hci_sak_to_protocol(skb->data[MICROREAD_EMCF_A3_SAK]); targets->sens_res =3D be16_to_cpu(*(u16 *)&skb->data[MICROREAD_EMCF_A3_ATQA]); targets->sel_res =3D skb->data[MICROREAD_EMCF_A3_SAK]; targets->nfcid1_len =3D skb->data[MICROREAD_EMCF_A3_LEN]; - if (targets->nfcid1_len > sizeof(targets->nfcid1)) { + if (targets->nfcid1_len > sizeof(targets->nfcid1) || + targets->nfcid1_len > skb->len - MICROREAD_EMCF_A3_UID) { r =3D -EINVAL; goto exit_free; } @@ -511,11 +523,21 @@ static void microread_target_discovered(struct nfc_hc= i_dev *hdev, u8 gate, targets->nfcid1_len); break; case MICROREAD_GATE_ID_MREAD_ISO_B: + if (skb->len < MICROREAD_EMCF_B_UID + 4) { + r =3D -EINVAL; + goto exit_free; + } + targets->supported_protocols =3D NFC_PROTO_ISO14443_B_MASK; memcpy(targets->nfcid1, &skb->data[MICROREAD_EMCF_B_UID], 4); targets->nfcid1_len =3D 4; break; case MICROREAD_GATE_ID_MREAD_NFC_T1: + if (skb->len < MICROREAD_EMCF_T1_UID + 4) { + r =3D -EINVAL; + goto exit_free; + } + targets->supported_protocols =3D NFC_PROTO_JEWEL_MASK; targets->sens_res =3D le16_to_cpu(*(u16 *)&skb->data[MICROREAD_EMCF_T1_ATQA]); @@ -523,6 +545,11 @@ static void microread_target_discovered(struct nfc_hci= _dev *hdev, u8 gate, targets->nfcid1_len =3D 4; break; case MICROREAD_GATE_ID_MREAD_NFC_T3: + if (skb->len < MICROREAD_EMCF_T3_UID + 8) { + r =3D -EINVAL; + goto exit_free; + } + targets->supported_protocols =3D NFC_PROTO_FELICA_MASK; memcpy(targets->nfcid1, &skb->data[MICROREAD_EMCF_T3_UID], 8); targets->nfcid1_len =3D 8; --=20 2.50.1 (Apple Git-155)