mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-12-07 20:24:41 +00:00
c782a2244e
This removes all the patches which have been upstreamed since 4.4.x and only leaves patches for a minor fix to AF_VSOCK, the Hyper-V socket patch and a new patch for fixing delays on creating netns with tunnel interfaces. The latter has been accecpted into the upstream netdev branch and will likely appear in 4.9.0 and we can cherry pick from there then. Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
30 lines
910 B
Diff
30 lines
910 B
Diff
From 888876dd84da7cdcb7c2ce7568efb2a2adbc9031 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 1/5] 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 8a398b3..0edc54c 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.10.1
|