netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] nbd: restrict sockets to TCP and UDP
@ 2025-09-09 13:22 Eric Dumazet
  2025-09-09 13:29 ` Jens Axboe
                   ` (2 more replies)
  0 siblings, 3 replies; 17+ messages in thread
From: Eric Dumazet @ 2025-09-09 13:22 UTC (permalink / raw)
  To: Josef Bacik, Jens Axboe
  Cc: linux-kernel, netdev, Eric Dumazet, Eric Dumazet,
	syzbot+e1cd6bd8493060bd701d, Mike Christie, Richard W.M. Jones,
	Yu Kuai, linux-block, nbd

Recently, syzbot started to abuse NBD with all kinds of sockets.

Commit cf1b2326b734 ("nbd: verify socket is supported during setup")
made sure the socket supported a shutdown() method.

Explicitely accept TCP and UNIX stream sockets.

Fixes: cf1b2326b734 ("nbd: verify socket is supported during setup")
Reported-by: syzbot+e1cd6bd8493060bd701d@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/netdev/CANn89iJ+76eE3A_8S_zTpSyW5hvPRn6V57458hCZGY5hbH_bFA@mail.gmail.com/T/#m081036e8747cd7e2626c1da5d78c8b9d1e55b154
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Mike Christie <mchristi@redhat.com>
Cc: Richard W.M. Jones <rjones@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Yu Kuai <yukuai1@huaweicloud.com>
Cc: linux-block@vger.kernel.org
Cc: nbd@other.debian.org
---
 drivers/block/nbd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 6463d0e8d0cef71e73e67fecd16de4dec1c75da7..87b0b78249da3325023949585f4daf40486c9692 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1217,6 +1217,14 @@ static struct socket *nbd_get_socket(struct nbd_device *nbd, unsigned long fd,
 	if (!sock)
 		return NULL;
 
+	if (!sk_is_tcp(sock->sk) &&
+	    !sk_is_stream_unix(sock->sk)) {
+		dev_err(disk_to_dev(nbd->disk), "Unsupported socket: should be TCP or UNIX.\n");
+		*err = -EINVAL;
+		sockfd_put(sock);
+		return NULL;
+	}
+
 	if (sock->ops->shutdown == sock_no_shutdown) {
 		dev_err(disk_to_dev(nbd->disk), "Unsupported socket: shutdown callout must be supported.\n");
 		*err = -EINVAL;
-- 
2.51.0.384.g4c02a37b29-goog


^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2025-11-24 11:04 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-09 13:22 [PATCH] nbd: restrict sockets to TCP and UDP Eric Dumazet
2025-09-09 13:29 ` Jens Axboe
2025-09-09 13:32 ` Richard W.M. Jones
2025-09-09 14:04   ` Eric Dumazet
2025-09-09 14:35     ` Eric Dumazet
2025-09-09 14:37       ` Jens Axboe
2025-09-09 14:47         ` Eric Dumazet
2025-09-09 15:09           ` Jens Axboe
2025-09-09 15:18           ` Richard W.M. Jones
2025-09-09 15:33             ` Eric Dumazet
2025-09-10 15:55               ` Stefano Garzarella
2025-09-12  9:23               ` Simon Horman
2025-09-09 17:16             ` Richard W.M. Jones
2025-11-18 17:56 ` Pavel Machek
2025-11-18 18:16   ` Richard W.M. Jones
2025-11-19  9:10     ` Userland used in writeback path was " Pavel Machek
2025-11-24 11:04       ` Richard W.M. Jones

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 NNTP newsgroup(s).