From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f12.google.com (mail-pz2-f12.google.com [74.125.228.12]) (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 C6B76534477 for ; Tue, 22 Sep 2026 10:21:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.12 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790072517; cv=none; b=DZa2aLB+N0oePZ6ybomIsdpaXjABwCmt2i4DJsS+MEbagoMWk+lhHWydT7kPetXsNyzhadyrjOWn2SYM0b9EAnxnQUk2wF3Z4lUONaVAIQlc1/AjGQATfDR1v7rR1l7PD0BjKA9UOKOd9tK4dt6CsW64n4qvSWqYpuVMFPvHeb0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790072517; c=relaxed/simple; bh=PB10iJXwaQiQpgWMplLuUrRqupycNcSJ1CXoBYEhb+M=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=tY6rt4LVnCNZk2duRmLLHfL3KuDF7z9/hEvlQXRNeNi+fn2AT71NNckE1jtS9mudyDsZsSKKSO5MHOG/Crq0ldaSf4daNS3BcKq+gCLoNaClSVQIipUbUp8QULSs5q8aWAB6fpnJfAsVoBN0HMssrMgHyBfKuDaB1b5IweDFad0= 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=OPbXZCfz; arc=none smtp.client-ip=74.125.228.12 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="OPbXZCfz" Received: by mail-pz2-f12.google.com with SMTP id d2e1a72fcca58-8631d0023daso2919973b3a.2 for ; Tue, 22 Sep 2026 03:21:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790072514; x=1790677314; 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=qRPMgMOIc56QBWBupM6kM1mJ5Xh3d/f5V1FOIpaRUQI=; b=OPbXZCfzQZP1oVGJov0EJw0DExrIWsm7ae46C/Tl/dObdQcbZWZDaig2wbiOj3gijb hpnYkk0uPL9kjiwo+CHPaTWJBx8t5zzDG6rowGz4iOZIUPS8AX5xaq9+KJTElkRDbWcm NGIUWpCPy+e5MTTioFN+/DiFr3bBGH3L1as/1gMZqD53HgYiEnrWkavWG44GAjNX+lAd z6W5FDgIS7AOMHLG/1jq+4Qid5o2B9o0zhxuYbP130DrMtujacKt4wcQ/mvFRW/GbjEW 1DPP2tuvjj8W385ckE6scdYUljmAx8DVmiiWi3d+2UBK7ZTmq2vCSQsVMufWaZJKx7Q9 Zo3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790072514; x=1790677314; 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=qRPMgMOIc56QBWBupM6kM1mJ5Xh3d/f5V1FOIpaRUQI=; b=EXPoZB40+Do82Blr5A2CJjAZbV0p3ZyoR8l/R9nYouTafw7rEds0E0Nu8sDsNw3wqC OEm5ZHbmy+iMcxThzHUlI1NiE0tPD1yhuHNp7WIkztdJxCbqFy/6BBJgC6ZEwOc5XCol wyFWy/Ay8L7OvDnsVe9BIGTdj6apDapfS00yaRcVWCfRbYmQK//IxayWNeoZ8ZjOm2CK 5b7Igyae1NP5l6hw4xIQyISGtHEXHY8zF3PhfqDxCyFJuIIxpCfDcOb+yEdWS5YHPyN1 tsRLyU2K3J3+6elvfH0TyvCIEzHBJTq/wzTI5Iz8483X1wIMJVd8cS6JSQgkksfZj1V+ ZRSg== X-Forwarded-Encrypted: i=1; AKwUvBwHFnJ0IpcRVFzxkK14ZlyZrtfrMbX8Hphh8KlEe0G0zp7H1apQv6hPAk2YgOcoOwnPbRBignA=@vger.kernel.org X-Gm-Message-State: AFuF++kQeHEf1WVt4xiRVZT1ZmNpqOHY+3EJp8FUeXFgDRXn4+0AnKHy w+WjFs7T9Ozpr/1cWBE1ANcvM+7VvJ5N90tDyv98823b7fiBfcvLv2Kt X-Gm-Gg: AYBFou35Xo/zHlLakuKJJ/Mpld3xyXJmuX3MrvNf5z7avcGk3KJu/qQVcKsGfqX6rg2 oETHSpMQhC+O9s8gW4GyyPatIo+yJWAi7qLvgst5iEtzN6/cRIHcRhrqEW0MkiSprKIS69eaQsm Fg9n3BoLhP3m51o+prshOKr04Zn3zpg6KQywMjV2gMyy361jLE7ABJ+Hu+X5P/ucaOmdtOjncaY aUeATyysFxLEnSCOKUzCIbdzn24C1ixERXCrb2AZkLah+NWSaxsTm602fhSXY8uRH58CiXHho6x HOYgviS1XOeqUsZxr2BA6Z1U0idHz0zW43PKxhuEQPZuQlDXBtSigI7PU1s399j+H4zi9qno/Da 9jrTUnRkysAPVW0YojBtCSFplezaBENXZfIO4vNPhyKWuWVWPlT5vtM0F+U7juRPmljackDSYvb HagjpdDWa6A9WF/21NjkpklGeJ7SknM8QJcpxQDfMFkxBXb6+31WykFDZRDQOscpkgVMrIoET9D ZoanfIcW1TkfnPmLfn7W3wNiNqlqjMHbwo5Jm5Q4VKyXVXl X-Received: by 2002:a05:6a20:4303:b0:3dd:a195:dd68 with SMTP id adf61e73a8af0-3ddec8a09d8mr755808637.74.1790072513951; Tue, 22 Sep 2026 03:21:53 -0700 (PDT) Received: from localhost.localdomain ([2409:8a1e:2e81:7320:4d0:75ae:9920:3973]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cc756a34691sm682623a12.17.2026.09.22.03.21.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 22 Sep 2026 03:21:53 -0700 (PDT) From: Yuchao Zhang To: Simon Horman Cc: david@ixit.cz, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, oe-linux-nfc@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Yuchao Zhang Subject: [PATCH v2] nfc: nci: ignore unexpected CORE_RESET_NTF and CORE_RESET_RSP Date: Tue, 22 Sep 2026 18:21:44 +0800 Message-ID: <20260922102144.39689-1-ndaugoing@gmail.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Commit bcd684aace34 ("net/nfc/nci: Support NCI 2.x initial sequence") added handling of CORE_RESET_NTF in nci_core_reset_ntf_packet(). When received, it updates ndev->nci_ver, ndev->manufact_id, and ndev->manufact_specific_info, and calls nci_req_complete(ndev, NCI_STATUS_OK) to finish the pending reset request. However, unlike other notification handlers in ntf.c (which validate ndev->state before completing requests), nci_core_reset_ntf_packet() does not check whether a core reset request is actually pending. If an unsolicited or delayed CORE_RESET_NTF arrives (e.g. after a reset command times out or from a misbehaving NFCC), it unconditionally: 1. Completes whatever request is currently in-flight (such as CORE_INIT, RF_DISCOVER, or CONN_CREATE) with NCI_STATUS_OK, leading to kernel state desynchronization. 2. Overwrites ndev->nci_ver and manufacturer info. Because ndev->nci_ver is used as a selector for subsequent packet formats and parsers (e.g., in nci_open_device() and nci_core_init_rsp_packet()), unexpectedly modifying it can cause protocol format confusion. A similar issue exists in nci_core_reset_rsp_packet(): an unexpected or delayed response packet can prematurely complete an unrelated in-flight request. Fix this by ensuring CORE_RESET_NTF and CORE_RESET_RSP are only processed by the core layer when a reset command is actively awaiting them: - Set NCI_RESET_PENDING in nci_reset_req() when sending CORE_RESET_CMD. - In nci_core_reset_rsp_packet(), ignore the response if NCI_RESET_PENDING is not set. If set, clear the flag and complete the request on failure or for NCI 1.x (checking skb->len >= sizeof(*rsp)). - In __nci_request(), ensure NCI_RESET_PENDING is cleared upon request completion, cancellation, or timeout. - In nci_core_reset_ntf_packet(), skip power-on notifications (trigger 0x01, identical in NCI 1.0 and 2.0), then check and clear NCI_RESET_PENDING before updating device fields and completing the request. The CORE_RESET_CMD trigger value is revision-dependent (0x00 in NCI 1.0, 0x02 in NCI 2.0), so both are accepted and gated on NCI_RESET_PENDING alone. If unexpected, log a warning and return 0 so driver-specific handlers (such as fdp firmware patch handling) still receive the notification. Fixes: bcd684aace34 ("net/nfc/nci: Support NCI 2.x initial sequence") Cc: stable@vger.kernel.org Signed-off-by: Yuchao Zhang --- v2: - Do not abort the notification pipeline on unexpected CORE_RESET_NTF (return 0 instead of -EINVAL), preserving driver-level hooks (e.g. fdp firmware patching) per Simon Horman. - Skip power-on notifications (trigger 0x01, identical in NCI 1.0 and 2.0) while gating both NCI 1.0 (0x00) and NCI 2.0 (0x02) command-triggered resets on NCI_RESET_PENDING alone. - Check NCI_RESET_PENDING in nci_core_reset_rsp_packet() to avoid completing unrelated requests on unexpected responses. - Explicitly check skb->len >= sizeof(*rsp) in nci_core_reset_rsp_packet() for NCI 1.x handling. include/net/nfc/nci.h | 5 +++++ include/net/nfc/nci_core.h | 1 + net/nfc/nci/core.c | 3 +++ net/nfc/nci/ntf.c | 17 ++++++++++++++++- net/nfc/nci/rsp.c | 24 ++++++++++++++++++------ 5 files changed, 43 insertions(+), 7 deletions(-) diff --git a/include/net/nfc/nci.h b/include/net/nfc/nci.h index 09efcaed7c3f..2ac45adba088 100644 --- a/include/net/nfc/nci.h +++ b/include/net/nfc/nci.h @@ -140,6 +140,11 @@ #define NCI_RESET_TYPE_KEEP_CONFIG 0x00 #define NCI_RESET_TYPE_RESET_CONFIG 0x01 +/* NCI Reset Triggers */ +#define NCI_RESET_TRIGGER_ERROR 0x00 +#define NCI_RESET_TRIGGER_POWER_ON 0x01 +#define NCI_RESET_TRIGGER_RESET_CMD 0x02 + /* NCI Static RF connection ID */ #define NCI_STATIC_RF_CONN_ID 0x00 diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h index 664d5058e66e..504ea91ddf27 100644 --- a/include/net/nfc/nci_core.h +++ b/include/net/nfc/nci_core.h @@ -31,6 +31,7 @@ enum nci_flag { NCI_DATA_EXCHANGE, NCI_DATA_EXCHANGE_TO, NCI_UNREG, + NCI_RESET_PENDING, }; /* NCI device states */ diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 5f46c4b5720f..5a90591cd9af 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -134,6 +134,7 @@ static int __nci_request(struct nci_dev *ndev, } ndev->req_status = ndev->req_result = 0; + clear_bit(NCI_RESET_PENDING, &ndev->flags); return rc; } @@ -163,6 +164,8 @@ static void nci_reset_req(struct nci_dev *ndev, const void *opt) { struct nci_core_reset_cmd cmd; + set_bit(NCI_RESET_PENDING, &ndev->flags); + cmd.reset_type = NCI_RESET_TYPE_RESET_CONFIG; nci_send_cmd(ndev, NCI_OP_CORE_RESET_CMD, 1, &cmd); } diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c index f5c9a8ab7ec1..57f99bf46a22 100644 --- a/net/nfc/nci/ntf.c +++ b/net/nfc/nci/ntf.c @@ -36,7 +36,22 @@ static int nci_core_reset_ntf_packet(struct nci_dev *ndev, if (skb->len < sizeof(struct nci_core_reset_ntf)) return -EINVAL; - ntf = (struct nci_core_reset_ntf *)skb->data; + ntf = (const struct nci_core_reset_ntf *)skb->data; + + /* + * A power-on notification must not update core protocol state nor + * complete a pending request. The CORE_RESET_CMD trigger value is + * revision-dependent (0x00 in NCI 1.0, 0x02 in NCI 2.0), so both + * are let through to the reset-pending gate below instead. + * Return 0 so driver-specific notification hooks can still run. + */ + if (ntf->reset_trigger == NCI_RESET_TRIGGER_POWER_ON) + return 0; + + if (!test_and_clear_bit(NCI_RESET_PENDING, &ndev->flags)) { + pr_warn_ratelimited("unexpected CORE_RESET_NTF\n"); + return 0; + } ndev->nci_ver = ntf->nci_ver; pr_debug("nci_ver 0x%x, config_status 0x%x\n", diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c index b0ab4f5acbce..3a2491497e4b 100644 --- a/net/nfc/nci/rsp.c +++ b/net/nfc/nci/rsp.c @@ -32,14 +32,26 @@ static void nci_core_reset_rsp_packet(struct nci_dev *ndev, pr_debug("status 0x%x\n", rsp->status); + /* + * If no reset request is pending, ignore unexpected responses to avoid + * prematurely completing an unrelated request. + */ + if (!test_bit(NCI_RESET_PENDING, &ndev->flags)) + return; + + if (rsp->status != NCI_STATUS_OK) { + clear_bit(NCI_RESET_PENDING, &ndev->flags); + nci_req_complete(ndev, rsp->status); + return; + } + /* Handle NCI 1.x ver */ - if (skb->len != 1) { - if (rsp->status == NCI_STATUS_OK) { - ndev->nci_ver = rsp->nci_ver; - pr_debug("nci_ver 0x%x, config_status 0x%x\n", - rsp->nci_ver, rsp->config_status); - } + if (skb->len >= sizeof(*rsp)) { + ndev->nci_ver = rsp->nci_ver; + pr_debug("nci_ver 0x%x, config_status 0x%x\n", + rsp->nci_ver, rsp->config_status); + clear_bit(NCI_RESET_PENDING, &ndev->flags); nci_req_complete(ndev, rsp->status); } } -- 2.53.0