Skip to content

Commit fe69fed

Browse files
sam4kgregkh
authored andcommitted
nfc: nci: fix uninit-value in the RF discover/activated NTF handlers
commit 8cbe06c upstream. nci_rf_discover_ntf_packet() and nci_rf_intf_activated_ntf_packet() each parse a notification into an on-stack struct (nci_rf_discover_ntf / nci_rf_intf_activated_ntf) that is not initialised. The RF technology-specific parameters are only extracted when rf_tech_specific_params_len is non-zero, so a notification that reports a zero length leaves the rf_tech_specific_params union uninitialised - and both handlers then pass it to nci_add_new_protocol(), which reads it: - discover: nci_add_new_target() -> nci_add_new_protocol(); - activated: nci_target_auto_activated() -> nci_add_new_protocol(). nci_add_new_protocol() uses nfca_poll->nfcid1_len as both a branch condition and a memcpy() length and copies nfcid1/sens_res/sel_res into ndev->targets, which is later exposed to user space via NFC_CMD_GET_TARGET. BUG: KMSAN: uninit-value in nci_add_new_protocol+0x624/0x6c0 nci_add_new_protocol+0x624/0x6c0 nci_ntf_packet+0x25b2/0x3c30 nci_rx_work+0x318/0x5d0 process_scheduled_works+0x84b/0x17a0 worker_thread+0xc10/0x11b0 kthread+0x376/0x500 Local variable ntf.i created at: nci_ntf_packet+0xbc2/0x3c30 Zero-initialise both on-stack notifications so the union reads back as zero when no technology-specific parameters are present. Fixes: 019c4fb ("NFC: Add NCI multiple targets support") Fixes: e8c0dac ("NFC: Update names and structs to NCI spec 1.0 d18") Link: https://lore.kernel.org/netdev/20260623172109.1105965-2-horms@kernel.org/ Cc: stable@vger.kernel.org Assisted-by: Bynario AI Signed-off-by: Samuel Page <sam@bynar.io> Link: https://patch.msgid.link/20260626090301.2139500-1-sam@bynar.io Signed-off-by: David Heidelberg <david@ixit.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent afd8605 commit fe69fed

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

net/nfc/nci/ntf.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ void nci_clear_target_list(struct nci_dev *ndev)
440440
static int nci_rf_discover_ntf_packet(struct nci_dev *ndev,
441441
const struct sk_buff *skb)
442442
{
443-
struct nci_rf_discover_ntf ntf;
443+
struct nci_rf_discover_ntf ntf = {};
444444
const __u8 *data;
445445
bool add_target = true;
446446

@@ -672,7 +672,7 @@ static int nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
672672
const struct sk_buff *skb)
673673
{
674674
struct nci_conn_info *conn_info;
675-
struct nci_rf_intf_activated_ntf ntf;
675+
struct nci_rf_intf_activated_ntf ntf = {};
676676
const __u8 *data;
677677
int err = NCI_STATUS_OK;
678678

0 commit comments

Comments
 (0)