Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11387b2e authored by Ryosuke Yasuoka's avatar Ryosuke Yasuoka Committed by Greg Kroah-Hartman
Browse files

nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet



[ Upstream commit d24b03535e5eb82e025219c2f632b485409c898f ]

syzbot reported the following uninit-value access issue [1][2]:

nci_rx_work() parses and processes received packet. When the payload
length is zero, each message type handler reads uninitialized payload
and KMSAN detects this issue. The receipt of a packet with a zero-size
payload is considered unexpected, and therefore, such packets should be
silently discarded.

This patch resolved this issue by checking payload size before calling
each message type handler codes.

Fixes: 6a2968aa ("NFC: basic NCI protocol implementation")
Reported-and-tested-by: default avatar <syzbot+7ea9413ea6749baf5574@syzkaller.appspotmail.com>
Reported-and-tested-by: default avatar <syzbot+29b5ca705d2e0f4a44d2@syzkaller.appspotmail.com>
Closes: https://syzkaller.appspot.com/bug?extid=7ea9413ea6749baf5574 [1]
Closes: https://syzkaller.appspot.com/bug?extid=29b5ca705d2e0f4a44d2

 [2]
Signed-off-by: default avatarRyosuke Yasuoka <ryasuoka@redhat.com>
Reviewed-by: default avatarJeremy Cline <jeremy@jcline.org>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8cbdd324
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -1511,6 +1511,11 @@ static void nci_rx_work(struct work_struct *work)
		nfc_send_to_raw_sock(ndev->nfc_dev, skb,
				     RAW_PAYLOAD_NCI, NFC_DIRECTION_RX);

		if (!nci_plen(skb->data)) {
			kfree_skb(skb);
			break;
		}

		/* Process frame */
		switch (nci_mt(skb->data)) {
		case NCI_MT_RSP_PKT: