From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.215.169 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795060985; b=4EmOWU1Nnw0+P0zKO9l3VQRhI8cAqWeX5OGYeJXjhtdeuXVNhYbyHs5+jo2NNzym1Nvx KiiMO9C7qj0pMYEHIgf2LeHwWSgK/VFo6MSDkoMkD/gA68U9D0ntqa+gE6XoHiAfMU4wq WUraXo19RjZLWMiL4ic3z27zjdG9V9eww3DDDFZ31mvYYPd8OHAwPByoyuImdRAz30NjM 5jfgHf0JsTjnegWiMmx0yerXVTU1qmX2/WnyERH3rVjQUbIcZo7IzLGEDFzryTmBJpGoC pgoZIUere/mNnmAu828kdCjif1R0NxEgx6Rq9mZzd0uviOX79PIBuSMiNUdMhkzdutw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795060985; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:To:Cc:Subject: Date:Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=uJTeJR5eoOxAAfYNVIbKciM1+UPVngasXpXnnN+uSGo=; b=LGBAFRdl5q2FCTknMZTUXZgV19cowRZ/tfMr8gy77Et45XxbPwXiGJD4iyNG2f6yPrD+ MU2B9hI4bmVuPQr7Ld2zruPNfOdhSkFQ/lYAzJzym2UiFUL0qYnB1c19B5u1egl3TWXKi /W3RhsS7g7P5lxwGFS/R4TJ6eshZGyQ//+p3jTDNs2BOurJpXB+eifZZEmwy18dEZhcdv /dPwxM7fosvZt+GYFQyzCuJ0sLCp0djzVvINb9vZHHdPbjX9EjzUViKR5kU2NBPbZ6m1S uLnnq1rsVFJK9fGGhTBifxOZlhjR0nBThRY8BfYkQj0rwjO6CLdgAPSF6TmcENUi3Hg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=octane.security; spf=pass smtp.mailfrom=octane.security; dkim=pass header.d=octane.security header.i=@octane.security header.a=rsa-sha256 header.s=google header.b="q5yBZsL/"; arc=none smtp.remote-ip=209.85.215.169 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A22DA606A337 for ; Thu, 19 Nov 2026 04:03:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org A22DA606A337 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=octane.security Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=octane.security Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=octane.security header.i=@octane.security header.a=rsa-sha256 header.s=google header.b=q5yBZsL/ Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-cd6028ff33fso1258590a12.0 for ; Wed, 18 Nov 2026 20:03:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=octane.security; s=google; t=1795060984; x=1795665784; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=uJTeJR5eoOxAAfYNVIbKciM1+UPVngasXpXnnN+uSGo=; b=q5yBZsL/8yJqOmoc/FcG5Jj/8qa8rEUK/0dN9HZn0wfTASOKJYgl5qB/7FCPvWwrsQ zmOWZoXqjAZdykBK8EODOOXC9wMrj+Z9QEK/67J8H3TLYCUtm6MspNiuVLrAJxDvhtDr xULCDb+PmbPs9+JqZ3rDVp7BwdThJsc4XoMqcHVj45AHX6XFN3QBzCG4E2gb6GKCd9IL TnItF5E+paR3hkiDw6CkqSlS9kJL3WCJFuv6NGGQGUmYGoQtb09asicA87rFe39tNPoP 5SNHbsHtS+/fzdWhIqLD89grrj584OhZ/74xa3Q290fLPavvovay4KPTENP5emdM6u2D eAxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795060984; x=1795665784; h=content-transfer-encoding:mime-version:references:in-reply-to :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=uJTeJR5eoOxAAfYNVIbKciM1+UPVngasXpXnnN+uSGo=; b=LURBC9NLpYFMIQiN/9x8f3JXLkNZrzFBDTces+TSWqckXZPDDD5xOvaqJsDixUBxWJ CIBRpCUKrqmpBvwW/lw/5n/YCZV8+ErBMJTUzRxu4lFiAMutg3eiG1glx6UvB/jQZPYM g5TbeLf2uyrpxagm7cOzemm/fmwQ5qx6AtTU4Hxxm700GvbObYRQm6+SMGntG5J7PTJW GgCkMhakxPVPKKKFHWFu5r83p1RsIriraPUs8bTnFE97e+xt7VDDMOn8TXpLuw+YeIsZ 8MyaUrSdReGgAa4tisSpIhp94QkLRqCKNu9x8iZMur8/x6twsA+jcRtnarRjMeMePE8u F3RA== X-Gm-Message-State: APuU4Z8xPZ19vrQ91NKoiUSDTCYBiZG3H+uJYYTNfSPH5tuL8SsGXLYH xYm8coaNFz8hmOz6wcJK3lSnUYc4I83/q0LiTNVwrr/8IXn9R5lxBYV7M3S0M2Tr42zWA5BHg5C M91MR X-Gm-Gg: AZFdTZejVvTWsKVtRrnJie0ifErWC0n7TMOtsIlAItqL/8cFlAZtDEzRe8rmzs5EPgQ uCHgzBykytTsk9gl5QinNKja4J3ktSi4tOtFqY3A3IT+dCGrVupHpL3suMxnA9Kjp4KkDjaFsYQ RZcxThFneePNe8dHQmA2+T/JgadVmSK9OgXfSYYDWI+ajkEr/XjUjQnbLq3MpBhutvq/GkSCqDz AJEMazAG/tEqmOpD+cCx9fl1tXgtuqNbOw9i0TmTppwhTeGMUSkj0gG+ClOKS+Loph0ZoSABiOe pG7AsBpdnmOT0mPu4md1ddZYr9SkDdhpOzmPKvp/jRy2nHdADqkR6IU/3V1pZtEMQppvwrM78sU C8eApyARyPJZpu8mz/wI5nGvARHwNVcYax5AyzJVMX99SQ4XjQHD68Stxm+gPSBd0PHL0yHYnfb OnRzxa20/35mznuzXhx+Mko+dme23qgfWEJkWke0jQI2RkK8FkhiQ6/IxQZcFoxjjPnSUYAoW5i pUfgh6gjwFsYWI7oxuPzoARkc4FaWpxRvqpfcdCPEbqxspr533OJE+ZdZcI9qfsS7L0Fni/wUtB OO7YYSlRsKSp2EOjiN9OMXqhHv6ok6+DSMrmZSlwE6APPs2AKtvSnuIgk8OWiYjwVmmKfJpwrDS E76JvRxqiyn0kzSBgV6WkkXQbbLtp7azi3XQTjS1ZMhpuXh3oFAg= X-Received: by 2002:a17:90b:448b:b0:3b0:9782:8721 with SMTP id 98e67ed59e1d1-3b3d07b9f34mr4659096a91.36.1795060983787; Wed, 18 Nov 2026 20:03:03 -0800 (PST) Received: from localhost.localdomain ([103.207.175.108]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3b4057af4e2sm406863a91.7.2026.11.18.20.03.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 18 Nov 2026 20:03:03 -0800 (PST) From: Shubham Antil To: netdev@vger.kernel.org Cc: oe-linux-nfc@lists.linux.dev, david@ixit.cz, horms@kernel.org, gio@octane.security, stable@vger.kernel.org Subject: [PATCH net v8 2/4] nfc: reject overlapping firmware downloads Date: Thu, 19 Nov 2026 09:32:51 +0530 Message-ID: <20261119040253.15986-3-shubham@octane.security> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261119040253.15986-1-shubham@octane.security> References: <20261119040253.15986-1-shubham@octane.security> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit nfc_fw_download() records an asynchronous download before calling the driver, but does not reject another request while that download is active. If the driver rejects the second request with -EBUSY, the core clears fw_download_in_progress even though the first request is still running. Firmware frames can then be routed through the normal receive path and the device can be brought up before the original download completes. Check the core state while holding the NFC device lock and reject an overlapping request without changing that state. Keep asynchronous completion lockless because drivers can report completion while holding their own locks, while the start path calls into those drivers with the NFC device lock held. Nesting the device lock in both directions would create an inverse lock order. Use one-copy accesses in the completion, receive, and transmit callbacks, which cannot take the device lock, so all contexts observe the state without a data race. Discovered during an AI-assisted source audit using OpenAI Codex, gpt-5.6-sol. Patch development and test planning used the same assistant. Confirmed using an unmodified kernel and a pty-backed user-space controller which issued two NFC_CMD_FW_DOWNLOAD requests and checked that the second returned -EBUSY without disrupting the first; no error injection was used. With the final v8 fix applied, 105 first/overlapping request pairs passed under KASAN, UBSAN, and lockdep, and 105 pairs passed under strict-mode KCSAN. No in-tree selftest covers the NFC firmware-download path. Fixes: 9674da8759df ("NFC: Add firmware upload netlink command") Cc: stable@vger.kernel.org Signed-off-by: Shubham Antil --- drivers/nfc/nfcmrvl/main.c | 2 +- drivers/nfc/nfcmrvl/uart.c | 4 ++-- net/nfc/core.c | 13 +++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c index 6efa83219..b9b66127f 100644 --- a/drivers/nfc/nfcmrvl/main.c +++ b/drivers/nfc/nfcmrvl/main.c @@ -205,7 +205,7 @@ int nfcmrvl_nci_recv_frame(struct nfcmrvl_private *priv, struct sk_buff *skb) } } - if (priv->ndev->nfc_dev->fw_download_in_progress) { + if (READ_ONCE(priv->ndev->nfc_dev->fw_download_in_progress)) { nfcmrvl_fw_dnld_recv_frame(priv, skb); return 0; } diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c index 9aedd1687..4b989fc4e 100644 --- a/drivers/nfc/nfcmrvl/uart.c +++ b/drivers/nfc/nfcmrvl/uart.c @@ -159,7 +159,7 @@ static void nfcmrvl_nci_uart_tx_start(struct nci_uart *nu) { struct nfcmrvl_private *priv = (struct nfcmrvl_private *)nu->drv_data; - if (priv->ndev->nfc_dev->fw_download_in_progress) + if (READ_ONCE(priv->ndev->nfc_dev->fw_download_in_progress)) return; /* Remove BREAK to wake up the NFCC */ @@ -173,7 +173,7 @@ static void nfcmrvl_nci_uart_tx_done(struct nci_uart *nu) { struct nfcmrvl_private *priv = (struct nfcmrvl_private *)nu->drv_data; - if (priv->ndev->nfc_dev->fw_download_in_progress) + if (READ_ONCE(priv->ndev->nfc_dev->fw_download_in_progress)) return; /* diff --git a/net/nfc/core.c b/net/nfc/core.c index f52166929..b03b34b40 100644 --- a/net/nfc/core.c +++ b/net/nfc/core.c @@ -48,15 +48,20 @@ int nfc_fw_download(struct nfc_dev *dev, const char *firmware_name) goto error; } + if (READ_ONCE(dev->fw_download_in_progress)) { + rc = -EBUSY; + goto error; + } + if (!dev->ops->fw_download) { rc = -EOPNOTSUPP; goto error; } - dev->fw_download_in_progress = true; + WRITE_ONCE(dev->fw_download_in_progress, true); rc = dev->ops->fw_download(dev, firmware_name); if (rc) - dev->fw_download_in_progress = false; + WRITE_ONCE(dev->fw_download_in_progress, false); error: device_unlock(&dev->dev); @@ -73,7 +78,7 @@ int nfc_fw_download(struct nfc_dev *dev, const char *firmware_name) int nfc_fw_download_done(struct nfc_dev *dev, const char *firmware_name, u32 result) { - dev->fw_download_in_progress = false; + WRITE_ONCE(dev->fw_download_in_progress, false); return nfc_genl_fw_download_done(dev, firmware_name, result); } @@ -104,7 +109,7 @@ int nfc_dev_up(struct nfc_dev *dev) goto error; } - if (dev->fw_download_in_progress) { + if (READ_ONCE(dev->fw_download_in_progress)) { rc = -EBUSY; goto error; } -- 2.54.0