From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 942692FA0C4 for ; Sun, 28 Jun 2026 21:16:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782681400; cv=none; b=gGY8QIIhgpJU0tU4mQA4QwxTRhmlYa5pnuihssLZqsSJQtCmdRhxbPcqBHu3+jkBQokv4iF+5wSAhY/gsRDUtpHdomZREoiAQt+psp/SFG3UYgAoc52L7wnPoGkQOX9aaSk6wkYXhmFRQnexTDaFU4QnXxzDhUk2wl9x5akklio= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782681400; c=relaxed/simple; bh=wq9vbsRd4z1aEUNzFLhJHF4nnkcAgJGHkCTxiXCvGUk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=JOpq23fkLZZr6U0wiqV9FrTE0hCjBO4znNt43GcKi+p4jt4KpCS9+dfebdhVD/hPpyDb5l1b7oh34Di6ACWgPkuk9ToOHed3KQI4NiKPCMVlXkwYxRuFP5BobJT8gLmWCBKKoq5+IOEpf3aTtIDn7jhFJqBKTvIsvdde2KG33j4= 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=R10uOHed; arc=none smtp.client-ip=209.85.216.51 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="R10uOHed" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-37f816d01e3so1751298a91.2 for ; Sun, 28 Jun 2026 14:16:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782681398; x=1783286198; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=52R9zl6QfbAW5HIolSvFCYHUPFuJm6lr9c2cx/FRyQM=; b=R10uOHedbbWc/3cowbzQqANuxqvAgtfj+9QRkuKyRo3c7GMWy1/nidnwwTiWuad8cd 50fKhXFDcZApx7di6vujkazXlndw5i/x6hl50OhFcWfLG3s/yNHf+AS7xC0OFMV8/KFJ 5xHU0ErE8y+cEGBxr53NEOJ8IJpiTJKeRatzjKOjz9SOfMgbBux8zM801a/PnF2mghFr D8ke6mZYGVTBaAq28qjME2i5GC0PS6rAw3D0amH5z3EpwyGQdh5tNlm9hl+KXcQqiOJW jNEPOBE45OjlUPIcofFneYFjAOkRJPA4YjJcBSEQV2b8RuRE9et5cJptE/BPLJIGRGz3 Enwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782681398; x=1783286198; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=52R9zl6QfbAW5HIolSvFCYHUPFuJm6lr9c2cx/FRyQM=; b=YwbaUo7J+rBs5PN4MgdlbPEToGAWoxKYBr2dPSaj1R255mpJappdZzNDeI4Wer7ZXZ S7nw278/Qv2ZPoHvMe/m3+TwH1X9YPAI/z4EHockaxm/fPOd5wdojY14sZleHGUL1DHy Pm4a0C7eA3wT299HEzjeYCS294Z/YWw33ObcEmU+UnbA2T8ScVljgRSoKSOnOaYCbOHD Fo6d6DxdEb7FCdfSBnYnpfM2QWQtvb0zrQiemFtN91tsxc9g22OQj+v4E7sfaqP+hPS6 EXeCPz/IwIG5s5CCdmuhQ8rZHwPbnWGxT8lx2MQDPFcl98jKUzotytURlF+ztZvOaVH5 /abQ== X-Forwarded-Encrypted: i=1; AHgh+RrT8dmaUHsyoezOIEkm28ctTBC8w6AO3y7lV6IAyLBDfccC/LFlaGHfM3yvZi4CVHDyLDHDghk=@vger.kernel.org X-Gm-Message-State: AOJu0YxXygbDCA0N6FNIBt9QMlElsbNn+rZZibF+jgk/0yIWp+Cn0w/1 03VTtajFRZjR9EOVRPCHQJ66H6WE65cjBjBpgHbJVhQo2pj4g/M1OGCG X-Gm-Gg: AfdE7cltB7blh6UeTsaI+/RmzWdNcUYzd24EhX2HgA0W/QTYlLJzxuK1M9WjkeyINZ4 gLdg2zIO7JfHsiO92OJRUPZbgw3m7vhMj+zbO/2hGnUQa/hV8uNpswsCSPUGSzsvTsDjoNDsrAn uVb/8vB/8ZZY3r1gQkEFyeqQpBe9IgqR98j/IvU4fIMdV3C2ONW8M3RSCCYrZfQqRuaG8elCd5F VveprgfZxRP0KF2L2w4AWoVnklaEZ1wXJ+mqm+AUC69anDuAXrbLaq/Glpehsz9O6X5UYY9E5gD UXVe0Nhki3ucuaGqbMzRXUEcM2KAE7MSxTj2tsbNohzwUfxEV8giFOxWdb78q2A5DB56mwCONjj XMnLeAUAnK85sfdf3S29iBmXPSComyImpY28txt6T/LYE9/ytwGn658WzMv1hYwH3p4mewcerK3 czdH5JjkSIXr7pxFZFPkokx/kW7ynaLY0e4tVUdaQm4MFYjbRAB+IF5MjkCCI6oA== X-Received: by 2002:a17:90b:5548:b0:37f:ed7e:7e42 with SMTP id 98e67ed59e1d1-37fed7e7f5emr2136383a91.14.1782681397840; Sun, 28 Jun 2026 14:16:37 -0700 (PDT) Received: from node ([149.40.62.34]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37fd2bd0e49sm2403592a91.0.2026.06.28.14.16.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2026 14:16:36 -0700 (PDT) From: Muhammad Bilal To: David Heidelberg , netdev@vger.kernel.org Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , oe-linux-nfc@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH net] nfc: nci: fix use of uninitialized memory in NFC-DEP general bytes Date: Mon, 29 Jun 2026 02:16:27 +0500 Message-ID: <20260628211627.131617-1-meatuni001@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit nci_store_general_bytes_nfc_dep() derives the length of the NFC-DEP general bytes by subtracting the fixed general-bytes offset from the ATR length: atr_res_len - NFC_ATR_RES_GT_OFFSET (poll, offset 15) atr_req_len - NFC_ATR_REQ_GT_OFFSET (listen, offset 14) It never checks that the ATR is at least that long. When a RF_INTF_ACTIVATED_NTF reports an ATR shorter than the offset the subtraction is negative; because min_t() casts its arguments to __u8 the negative value becomes large and is then capped at NFC_ATR_RES_GB_MAXSIZE / NFC_ATR_REQ_GB_MAXSIZE. remote_gb_len is thus set to up to 47/48 even though only atr_res_len/atr_req_len bytes of the on-stack atr_res/atr_req buffer were copied from the packet, and the following memcpy() reads the uninitialized remainder into ndev->remote_gb. Skip storing the general bytes (leaving remote_gb_len at 0) when the ATR is shorter than the general-bytes offset. Fixes: a99903ec4566 ("NFC: NCI: Handle Target mode activation") Cc: stable@vger.kernel.org Signed-off-by: Muhammad Bilal --- net/nfc/nci/ntf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c index 63aa0a78472b1..802928ca4d51e 100644 --- a/net/nfc/nci/ntf.c +++ b/net/nfc/nci/ntf.c @@ -653,6 +653,9 @@ static int nci_store_general_bytes_nfc_dep(struct nci_dev *ndev, switch (ntf->activation_rf_tech_and_mode) { case NCI_NFC_A_PASSIVE_POLL_MODE: case NCI_NFC_F_PASSIVE_POLL_MODE: + if (ntf->activation_params.poll_nfc_dep.atr_res_len < + NFC_ATR_RES_GT_OFFSET) + break; ndev->remote_gb_len = min_t(__u8, (ntf->activation_params.poll_nfc_dep.atr_res_len - NFC_ATR_RES_GT_OFFSET), @@ -665,6 +668,9 @@ static int nci_store_general_bytes_nfc_dep(struct nci_dev *ndev, case NCI_NFC_A_PASSIVE_LISTEN_MODE: case NCI_NFC_F_PASSIVE_LISTEN_MODE: + if (ntf->activation_params.listen_nfc_dep.atr_req_len < + NFC_ATR_REQ_GT_OFFSET) + break; ndev->remote_gb_len = min_t(__u8, (ntf->activation_params.listen_nfc_dep.atr_req_len - NFC_ATR_REQ_GT_OFFSET), -- 2.54.0