nfc: nci: fix uninit-value in nci_core_init_rsp_packet()
Subsystems (4)
PATCH v2 1/1 nfc: nci: fix uninit-value in nci_core_init_rsp_packet()
The CORE_INIT_RSP handlers walk the response using length fields taken from the packet itself, without checking they stay within skb->len:
- v1 computes
rsp_2 = skb->data + 6 + rsp_1->num_supported_rf_interfaces;
from the on-wire (unclamped) interface count and then dereferences rsp_2, and memcpy()s the advertised interfaces - both can run past the received data;
- v2 walks supported_rf_interfaces[], advancing the cursor by an in-packet rf_extension_cnt with no bound.
A short CORE_INIT_RSP therefore makes the parser read past the packet (into the uninitialised tail of the RX skb); the values are stored into struct nci_dev and consumed while bringing the device up:
BUG: KMSAN: uninit-value in nci_dev_up+0x10f3/0x1720 nci_dev_up+0x10f3/0x1720 nfc_dev_up+0x187/0x380 nfc_genl_dev_up+0xdc/0x1a0 genl_rcv_msg+0x5d4/0x9e0 netlink_rcv_skb+0x28f/0x530 Uninit was stored to memory at: nci_rsp_packet+0x68f/0x2310 nci_rx_work+0x25f/0x5d0 Uninit was created at: __alloc_skb+0x540/0xd40 virtual_ncidev_write+0x65/0x210
Validate the response length before parsing or storing the variable-length parts, rejecting truncated responses with NCI_STATUS_SYNTAX_ERROR. In v1 the check is done before num_supported_rf_interfaces is stored into ndev, so a truncated response cannot leave ndev->num_supported_rf_interfaces holding the unclamped on-wire count, which nci_init_complete_req() would otherwise use as a bound for the fixed-size supported_rf_interfaces[] array.
---
v2: validate the response length before storing num_supported_rf_interfaces
into @ndev. In v1 the unclamped on-wire count was stored first and the length check returned early on a truncated response, leaving ndev->num_supported_rf_interfaces > NCI_MAX_SUPPORTED_RF_INTERFACES; a subsequent CORE_INIT completion then walked it in nci_init_complete_req(), which the syzbot CI run on v1 flagged as a UBSAN array-index-out-of-bounds.
https://ci.syzbot.org/series/2a9a8657-37a3-4dce-8cb5-2035027791dd
v1: https://lore.kernel.org/all/[email protected]
net/nfc/nci/rsp.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
net/nfc/nci/rsp.c +26 -2
@@ -50,11 +50,25 @@ static u8 nci_core_init_rsp_packet_v1(struct nci_dev *ndev,const struct nci_core_init_rsp_1 *rsp_1 = (void *)skb->data;const struct nci_core_init_rsp_2 *rsp_2; +if (skb->len <sizeof (*rsp_1)) +return NCI_STATUS_SYNTAX_ERROR ; +pr_debug ("status 0x%x\n" , rsp_1->status);if (rsp_1->status !=NCI_STATUS_OK )return rsp_1->status; +/* +* supported_rf_interfaces[] and the trailing nci_core_init_rsp_2 are +* addressed using the on-wire (unclamped) interface count, so the +* response must be long enough for both before any of it is parsed or +* stored into @ndev - otherwise a truncated response would leave +* ndev->num_supported_rf_interfaces holding the unclamped count. +*/ +if (skb->len <sizeof (*rsp_1) + + rsp_1->num_supported_rf_interfaces +sizeof (*rsp_2)) +return NCI_STATUS_SYNTAX_ERROR ; + ndev->nfcc_features =__le32_to_cpu (rsp_1->nfcc_features); ndev->num_supported_rf_interfaces = rsp_1->num_supported_rf_interfaces;
@@ -88,9 +102,13 @@ static u8 nci_core_init_rsp_packet_v2(struct nci_dev *ndev, {const struct nci_core_init_rsp_nci_ver2 *rsp = (void *)skb->data;const u8 *supported_rf_interface = rsp->supported_rf_interfaces; +const u8 *end = skb->data + skb->len;u8 rf_interface_idx =0 ;u8 rf_extension_cnt =0 ; +if (skb->len <sizeof (*rsp)) +return NCI_STATUS_SYNTAX_ERROR ; +pr_debug ("status %x\n" , rsp->status);if (rsp->status !=NCI_STATUS_OK )
@@ -104,10 +122,16 @@ static u8 nci_core_init_rsp_packet_v2(struct nci_dev *ndev, NCI_MAX_SUPPORTED_RF_INTERFACES);while (rf_interface_idx < ndev->num_supported_rf_interfaces) { - ndev->supported_rf_interfaces[rf_interface_idx++] = *supported_rf_interface++; +/* one interface byte + one extension-count byte must be present */ +if (end - supported_rf_interface <2 ) +return NCI_STATUS_SYNTAX_ERROR ; + ndev->supported_rf_interfaces[rf_interface_idx++] = + *supported_rf_interface++; -/* skip rf extension parameters */ +/* skip rf extension parameters, bounded by the packet */ rf_extension_cnt = *supported_rf_interface++; +if (rf_extension_cnt > end - supported_rf_interface) +return NCI_STATUS_SYNTAX_ERROR ; supported_rf_interface += rf_extension_cnt; }
base-commit: a986fde914d88af47eb78fd29c5d1af7952c3500
Signature · 1 line
2.54.0
Quoted 42 lines · Samuel Page
The
CORE_INIT_RSPhandlers walk the response using length fields taken from the packet itself, without checking they stay withinskb->len:- v1 computes
rsp_2 = skb->data + 6 + rsp_1->num_supported_rf_interfaces;from the on-wire (unclamped) interface count and then dereferences
rsp_2, and memcpy()s the advertised interfaces - both can run past the received data;
- v2 walks supported_rf_interfaces[], advancing the cursor by an in-packetrf_extension_cntwith no bound.A short
CORE_INIT_RSPtherefore makes the parser read past the packet (into the uninitialised tail of the RX skb); the values are stored into structnci_devand consumed while bringing the device up:BUG: KMSAN: uninit-value in nci_dev_up+0x10f3/0x1720 nci_dev_up+0x10f3/0x1720 nfc_dev_up+0x187/0x380 nfc_genl_dev_up+0xdc/0x1a0 genl_rcv_msg+0x5d4/0x9e0 netlink_rcv_skb+0x28f/0x530 Uninit was stored to memory at: nci_rsp_packet+0x68f/0x2310 nci_rx_work+0x25f/0x5d0 Uninit was created at: __alloc_skb+0x540/0xd40 virtual_ncidev_write+0x65/0x210Validate the response length before parsing or storing the variable-length parts, rejecting truncated responses with
NCI_STATUS_SYNTAX_ERROR. In v1 the check is done beforenum_supported_rf_interfacesis stored into ndev, so a truncated response cannot leavendev->num_supported_rf_interfacesholding the unclamped on-wire count, whichnci_init_complete_req()would otherwise use as a bound for the fixed-size supported_rf_interfaces[] array.Fixes 6a2968aaf50c ("NFC: basic NCI protocol implementation")Fixes bcd684aace34 ("net/nfc/nci: Support NCI 2.x initial sequence")Tested-by [email protected]Assisted-by Bynario AISigned-off-by Samuel Page <[email protected]>
Quoted 9 lines
---
v2: validate the response length before storingnum_supported_rf_interfaces
into @ndev. In v1 the unclamped on-wire count was stored first and the length check returned early on a truncated response, leavingndev->num_supported_rf_interfaces>NCI_MAX_SUPPORTED_RF_INTERFACES; a subsequentCORE_INITcompletion then walked it innci_init_complete_req(), which the syzbot CI run on v1 flagged as a UBSAN array-index-out-of-bounds.
https://ci.syzbot.org/series/2a9a8657-37a3-4dce-8cb5-2035027791dd
v1: https://lore.kernel.org/all/[email protected]
Quoted 1 line · Samuel Page
nfc: nci: fix uninit-value in
nci_core_init_rsp_packet()
Applied, thanks!
[1/1] nfc: nci: fix uninit-value in nci_core_init_rsp_packet()
commit: 27d431711a3a6e23e7f961ec2934de20e2ed7cac
Best regards,
Signature · 1 line
David Heidelberg <[email protected]>