Skip to content

Commit 2707746

Browse files
author
CKI KWF Bot
committed
Merge: nbd: restrict sockets to TCP and UDP
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1592 nbd: restrict sockets to TCP and UDP JIRA: https://issues.redhat.com/browse/RHEL-121713 Signed-off-by: Ming Lei <ming.lei@redhat.com> Approved-by: Jeff Moyer <jmoyer@redhat.com> Approved-by: Ewan D. Milne <emilne@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 969ce21 + cc5d774 commit 2707746

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/block/nbd.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,6 +1217,14 @@ static struct socket *nbd_get_socket(struct nbd_device *nbd, unsigned long fd,
12171217
if (!sock)
12181218
return NULL;
12191219

1220+
if (!sk_is_tcp(sock->sk) &&
1221+
!sk_is_stream_unix(sock->sk)) {
1222+
dev_err(disk_to_dev(nbd->disk), "Unsupported socket: should be TCP or UNIX.\n");
1223+
*err = -EINVAL;
1224+
sockfd_put(sock);
1225+
return NULL;
1226+
}
1227+
12201228
if (sock->ops->shutdown == sock_no_shutdown) {
12211229
dev_err(disk_to_dev(nbd->disk), "Unsupported socket: shutdown callout must be supported.\n");
12221230
*err = -EINVAL;

0 commit comments

Comments
 (0)