[PATCH net] Revert "nfc/nci: Add the inconsistency check between the input data length and count"

[PATCH net] Revert "nfc/nci: Add the inconsistency check between the input data length and count"

[Thadeu Lima de Souza Cascardo]

This reverts commit 068648aab72c9ba7b0597354ef4d81ffaac7b979.

NFC packets may have NUL-bytes. Checking for string length is not a correct
assumption here. As long as there is a check for the length copied from
copy_from_user, all should be fine.

The fix only prevented the syzbot reproducer from triggering the bug
because the packet is not enqueued anymore and the code that triggers the
bug is not exercised.

The fix even broke
testing/selftests/nci/nci_dev, making all tests there fail. After the
revert, 6 out of 8 tests pass.

Fixes: 068648aab72c ("nfc/nci: Add the inconsistency check between the input data length and count")
Cc: stable@vger.kernel.org
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
---
 drivers/nfc/virtual_ncidev.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/nfc/virtual_ncidev.c b/drivers/nfc/virtual_ncidev.c
index 9ef8ef2d4363..b957fce83b7c 100644
--- a/drivers/nfc/virtual_ncidev.c
+++ b/drivers/nfc/virtual_ncidev.c
@@ -125,10 +125,6 @@ static ssize_t virtual_ncidev_write(struct file *file,
 		kfree_skb(skb);
 		return -EFAULT;
 	}
-	if (strnlen(skb->data, count) != count) {
-		kfree_skb(skb);
-		return -EINVAL;
-	}
 
 	nci_recv_frame(vdev->ndev, skb);
 	return count;
-- 
2.47.3

Re: [PATCH net] Revert "nfc/nci: Add the inconsistency check between the input data length and count"

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 13 Jan 2026 17:24:58 -0300 you wrote:
> This reverts commit 068648aab72c9ba7b0597354ef4d81ffaac7b979.
> 
> NFC packets may have NUL-bytes. Checking for string length is not a correct
> assumption here. As long as there is a check for the length copied from
> copy_from_user, all should be fine.
> 
> The fix only prevented the syzbot reproducer from triggering the bug
> because the packet is not enqueued anymore and the code that triggers the
> bug is not exercised.
> 
> [...]

Here is the summary with links:
  - [net] Revert "nfc/nci: Add the inconsistency check between the input data length and count"
    https://git.kernel.org/netdev/net/c/f40ddcc0c0ca

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html