mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-12-08 05:25:57 +00:00
c41f680f7d
Series is at <1469716595-13591-1-git-send-email-stefanha@redhat.com>. This corresponds to v7 of the spec, posted in <1470324277-19300-1-git-send-email-stefanha@redhat.com> Also add a "cherry-picked from" to the "vsock: make listener child lock ordering explicit" patch and move it to the head of the series with the other vsock backports. Finally backport three new upstream fixes: 3fda5d6e5801 vhost/vsock: fix vhost virtio_vsock_pkt use-after-free 28ad55578b8a virtio-vsock: fix include guard typo 21bc54fc0cdc vhost/vsock: drop space available check for TX vq These were made on top of the version of the vsock patches which were added to Linux master in v4.8-rc1. This commit is based on the email posting, will replace with with proper cherry-pick separately. Requires corresponding backend changes in Hyperkit Signed-off-by: Ian Campbell <ian.campbell@docker.com>
32 lines
918 B
Diff
32 lines
918 B
Diff
From a39cc29b3cb531e73d4f03e64e12fc0de62f8d03 Mon Sep 17 00:00:00 2001
|
|
From: Ian Campbell <ian.campbell@docker.com>
|
|
Date: Mon, 4 Apr 2016 14:50:10 +0100
|
|
Subject: [PATCH 14/45] VSOCK: Only allow host network namespace to use
|
|
AF_VSOCK.
|
|
|
|
The VSOCK addressing schema does not really lend itself to simply creating an
|
|
alternative end point address within a namespace.
|
|
|
|
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
|
|
---
|
|
net/vmw_vsock/af_vsock.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
|
|
index 17dbbe6..1bb1b01 100644
|
|
--- a/net/vmw_vsock/af_vsock.c
|
|
+++ b/net/vmw_vsock/af_vsock.c
|
|
@@ -1852,6 +1852,9 @@ static const struct proto_ops vsock_stream_ops = {
|
|
static int vsock_create(struct net *net, struct socket *sock,
|
|
int protocol, int kern)
|
|
{
|
|
+ if (!net_eq(net, &init_net))
|
|
+ return -EAFNOSUPPORT;
|
|
+
|
|
if (!sock)
|
|
return -EINVAL;
|
|
|
|
--
|
|
2.9.3
|
|
|