* [PATCH net v2] nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
@ 2024-03-20 0:54 Ryosuke Yasuoka
2024-03-20 13:13 ` Jiri Pirko
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ryosuke Yasuoka @ 2024-03-20 0:54 UTC (permalink / raw
To: krzysztof.kozlowski, davem, edumazet, kuba, pabeni, horms, jeremy
Cc: Ryosuke Yasuoka, netdev, linux-kernel, syoshida,
syzbot+7ea9413ea6749baf5574, syzbot+29b5ca705d2e0f4a44d2
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: 6a2968aaf50c ("NFC: basic NCI protocol implementation")
Reported-and-tested-by: syzbot+7ea9413ea6749baf5574@syzkaller.appspotmail.com
Reported-and-tested-by: 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: Ryosuke Yasuoka <ryasuoka@redhat.com>
---
v2
- Fix typo in commit message
- Remove Call Trace from commit message that syzbot reported. Make it
shorter than the previous version.
- Check the payload length in earlier code path. And it can address
another reported syzbot bug too. [2]
v1
https://lore.kernel.org/all/20240312145658.417288-1-ryasuoka@redhat.com/
net/nfc/nci/core.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 6c9592d05120..f471fc54c6a1 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -1512,6 +1512,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:
--
2.44.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net v2] nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
2024-03-20 0:54 [PATCH net v2] nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet Ryosuke Yasuoka
@ 2024-03-20 13:13 ` Jiri Pirko
2024-03-20 14:11 ` Jeremy Cline
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jiri Pirko @ 2024-03-20 13:13 UTC (permalink / raw
To: Ryosuke Yasuoka
Cc: krzysztof.kozlowski, davem, edumazet, kuba, pabeni, horms, jeremy,
netdev, linux-kernel, syoshida, syzbot+7ea9413ea6749baf5574,
syzbot+29b5ca705d2e0f4a44d2
Wed, Mar 20, 2024 at 01:54:10AM CET, ryasuoka@redhat.com wrote:
>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.
Nit. Instead of talking about "this patch" in this patch description,
you should use imperative mood to tell the codebase what to do.
https://www.kernel.org/doc/html/v6.6/process/submitting-patches.html#describe-your-changes
Patch looks ok.
>
>Fixes: 6a2968aaf50c ("NFC: basic NCI protocol implementation")
>Reported-and-tested-by: syzbot+7ea9413ea6749baf5574@syzkaller.appspotmail.com
>Reported-and-tested-by: 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: Ryosuke Yasuoka <ryasuoka@redhat.com>
>---
>
>v2
>- Fix typo in commit message
>- Remove Call Trace from commit message that syzbot reported. Make it
> shorter than the previous version.
>- Check the payload length in earlier code path. And it can address
> another reported syzbot bug too. [2]
>
>v1
>https://lore.kernel.org/all/20240312145658.417288-1-ryasuoka@redhat.com/
>
>
> net/nfc/nci/core.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
>index 6c9592d05120..f471fc54c6a1 100644
>--- a/net/nfc/nci/core.c
>+++ b/net/nfc/nci/core.c
>@@ -1512,6 +1512,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:
>--
>2.44.0
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net v2] nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
2024-03-20 0:54 [PATCH net v2] nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet Ryosuke Yasuoka
2024-03-20 13:13 ` Jiri Pirko
@ 2024-03-20 14:11 ` Jeremy Cline
2024-03-22 6:14 ` Krzysztof Kozlowski
2024-03-22 9:50 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Jeremy Cline @ 2024-03-20 14:11 UTC (permalink / raw
To: Ryosuke Yasuoka, Krzysztof Kozlowski, David S . Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, horms
Cc: netdev, linux-kernel, syoshida, syzbot+7ea9413ea6749baf5574,
syzbot+29b5ca705d2e0f4a44d2
On Tue, Mar 19, 2024, at 8:54 PM, Ryosuke Yasuoka wrote:
> 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: 6a2968aaf50c ("NFC: basic NCI protocol implementation")
> Reported-and-tested-by: syzbot+7ea9413ea6749baf5574@syzkaller.appspotmail.com
> Reported-and-tested-by: 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: Ryosuke Yasuoka <ryasuoka@redhat.com>
> ---
For what it's worth,
Reviewed-by: Jeremy Cline <jeremy@jcline.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net v2] nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
2024-03-20 0:54 [PATCH net v2] nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet Ryosuke Yasuoka
2024-03-20 13:13 ` Jiri Pirko
2024-03-20 14:11 ` Jeremy Cline
@ 2024-03-22 6:14 ` Krzysztof Kozlowski
2024-03-22 9:50 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Krzysztof Kozlowski @ 2024-03-22 6:14 UTC (permalink / raw
To: Ryosuke Yasuoka, davem, edumazet, kuba, pabeni, horms, jeremy
Cc: netdev, linux-kernel, syoshida, syzbot+7ea9413ea6749baf5574,
syzbot+29b5ca705d2e0f4a44d2
On 20/03/2024 01:54, Ryosuke Yasuoka wrote:
> 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: 6a2968aaf50c ("NFC: basic NCI protocol implementation")
> Reported-and-tested-by: syzbot+7ea9413ea6749baf5574@syzkaller.appspotmail.com
> Reported-and-tested-by: 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: Ryosuke Yasuoka <ryasuoka@redhat.com>
> ---
>
> v2
> - Fix typo in commit message
> - Remove Call Trace from commit message that syzbot reported. Make it
> shorter than the previous version.
> - Check the payload length in earlier code path. And it can address
> another reported syzbot bug too. [2]
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net v2] nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
2024-03-20 0:54 [PATCH net v2] nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet Ryosuke Yasuoka
` (2 preceding siblings ...)
2024-03-22 6:14 ` Krzysztof Kozlowski
@ 2024-03-22 9:50 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-03-22 9:50 UTC (permalink / raw
To: Ryosuke Yasuoka
Cc: krzysztof.kozlowski, davem, edumazet, kuba, pabeni, horms, jeremy,
netdev, linux-kernel, syoshida, syzbot+7ea9413ea6749baf5574,
syzbot+29b5ca705d2e0f4a44d2
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <davem@davemloft.net>:
On Wed, 20 Mar 2024 09:54:10 +0900 you wrote:
> 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.
>
> [...]
Here is the summary with links:
- [net,v2] nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
https://git.kernel.org/netdev/net/c/d24b03535e5e
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-22 9:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-20 0:54 [PATCH net v2] nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet Ryosuke Yasuoka
2024-03-20 13:13 ` Jiri Pirko
2024-03-20 14:11 ` Jeremy Cline
2024-03-22 6:14 ` Krzysztof Kozlowski
2024-03-22 9:50 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).