From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 37C63434E28 for ; Tue, 28 Jul 2026 13:28:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785245330; cv=none; b=nLFP0f66plyP+YISzqS7Ec5oi57s697/dZSd+54+nMqNyCZeOVDluW5QEjAyNnN58U1gIeDAp1ofI4Gs4fOD3TP2wu7kFH8O/XRaEsmjlqI8gpdFA/474Fo0zGQYVwURrzdl7fTMe+Na50TOSNrfWiYt1wqOwb6WE5d71OhmOTA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785245330; c=relaxed/simple; bh=OAPZdRWyQy4q2zNyz4kGEhF+go9N3BGWG6beizQuBmk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=pX7WxuAwh1d3XDyCHM8yztI9/6VgGg/gRSSswfRBhghBOdI03LuSe5K9hwmKc6XmAJLOHUXpzw758TQ1/FyxDRhZ70j+KOpgtBYgVrB4e1Ac2y++1H8r9r2JWQ0992+++FDtjQ/tbs2cvwJD37bIXXq0gOYn2gwABeTjI86i4uc= 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=Q2M5XMVD; arc=none smtp.client-ip=209.85.128.44 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="Q2M5XMVD" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-490cf322ed0so27767715e9.1 for ; Tue, 28 Jul 2026 06:28:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785245326; x=1785850126; 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:content-type; bh=jpQekUlMBXKHH4ypTl4Zdo+4HRaR5MNGsxg/blhT7gI=; b=Q2M5XMVDuL//EMCoFPxRYH7zYAMuOHm9N0wNFFocdrR9KVMiTxGZkJ4pDORnxsPlJK bok1OSMOUi3SDqM+ETPqAYCISgEcjhg25MhYaOKJcvgQ/ON/NrciynJx9bdK1arcbS6M 4lxJTztypHC1HtV6K4QYwP247p+a9VzbEqezgi7ocb84vXPS8iYidIZiAeuzBhGzRGqr 78mFuJdeclGXdDAssu5V+McUXqOn82XjGvMaJRojnOobJLKEls6OLNifuj3BFCHY2Im9 3QAfatBHtKC6wpOZRjtU1f33ow48pepxz5OjXF9s8oNVdJofvfvN6fEk1OijDLKFGTGH CpNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785245326; x=1785850126; 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:content-type; bh=jpQekUlMBXKHH4ypTl4Zdo+4HRaR5MNGsxg/blhT7gI=; b=p+7pgcrHb982SlgGOpXLnJlSVg2wmC4TJ9Q3T/aulbsg5VNzs5ZgSdCFcuGiLyOy96 3WAs2PrznlXg1JywS4nu38174zP+bjErujCprpl1ETrrOKG/gmfk4rZMUsCTkrAXAMoL 1onVoaKGGKBUAwwHZDfQHkIGh36xvLMnIu5sHz+WaEwHgKl79/mfOpKDJH5VQp4OR4Ds VlJ6dOm+TCHf8IuN546cx55M+74twz6YrrxeuEMe+xH6e8s9NesnkCAv1GfcFwmfrYRQ nE1DIpOCyBCxu1wvrsy0tZjUUo+QoxieIx8P13lx9sSZls+SRvUVjW16ovV1F8gW+YOV GSBw== X-Forwarded-Encrypted: i=1; AHgh+Rr8IVv7HlG3qPbMA1ro3QqJ0mbii3eb879YcXOBEdTaJaPq+ToZTj3X59ak75XSMxdv16vpUew0LY45iuk=@vger.kernel.org X-Gm-Message-State: AOJu0Yxz9iHUsocxT6l87gmrK4MUykF6MtDYNtdWuoiwHgNccqYonK3O CgxKWukqDcqdCIbXgGaFvusp8hqiRxV05Gvfinx0NJoaMN2bJBogGECf X-Gm-Gg: AR+sD12UnVoMzYyzg864fPsWyynxVBDnXXRbK7aU3zpSHPZJBk4CRuioh2TVc4AGAAt iMomkn9grOnVoUZGw5FNtxW5BTevkv+9J6Oq/zDwtbVOg80lXqymajj8WXgmP3nXKDc3tHTop45 CbrWVPpD6PPg02QPQPuwAs+FQ/SJAnpcIVtKENGQejTY6nfItDign6sPi60gi6XFrFsiL8VNKIc iYwk1GqTVh0EXsgA6QiutQkEFQZPqUiBloUwGILiPEvmNeuvD/ipHuFerR/3yYbA4GZz6M/52AB Zpb+JTcfUS1PJTh6RvpJf+TtQbCYOM2dS2BMwzkhl0QyKii7bRG+l7jpnm2XXM0KUvS2r7+ulqI UItGAd33Iht76Qu4S1ZHzhdoY1jHPWOKTLjAE2dEKKgRc6QW+9NDaVGwZYU8oCKvimGx5d4rMyp ioPn+DaLktSmPHD4EorxRJADgjVWPvBOjm3HPYIwlRcg2tVTuT0MVSIr4= X-Received: by 2002:a05:600c:19c8:b0:495:4b00:1bab with SMTP id 5b1f17b1804b1-496c6565e12mr28399355e9.21.1785245326303; Tue, 28 Jul 2026 06:28:46 -0700 (PDT) Received: from fedora ([202.47.63.86]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4957f9b8b67sm359163395e9.4.2026.07.28.06.28.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 06:28:45 -0700 (PDT) From: Muhammad Bilal To: david@ixit.cz, netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, oe-linux-nfc@lists.linux.dev, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Muhammad Bilal Subject: [PATCH net v3] nfc: nci: fix use of uninitialized memory in NFC-DEP general bytes Date: Tue, 28 Jul 2026 18:28:36 +0500 Message-ID: <20260728132836.41868-1-meatuni001@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@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 when the ATR is shorter than the general-bytes offset. remote_gb_len is already zeroed unconditionally at the top of the function by commit 9c328f54741b ("net: nfc: nci: Add parameter validation for packet data"), so the short-ATR case needs no separate zeroing here anymore, unlike in the v2 posted upstream. Fixes: a99903ec4566 ("NFC: NCI: Handle Target mode activation") Cc: stable@vger.kernel.org Signed-off-by: Muhammad Bilal --- v3: Rebased onto current net.git for-next, requested by David Heidelberg. The function moved and gained an unconditional "remote_gb_len = 0" at entry (from commit 9c328f54741b, landed after v2 was posted), which made v2's explicit zeroing inside the short-ATR branch redundant, so this version drops it and only adds the missing length checks. v2: Also zero remote_gb_len explicitly in the short-ATR branch so a stale value from a previous activation doesn't survive into the new session. 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 c96512bb8653..e0555c90d657 100644 --- a/net/nfc/nci/ntf.c +++ b/net/nfc/nci/ntf.c @@ -631,6 +631,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), @@ -643,6 +646,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.55.0