mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-12-02 17:56:44 +00:00
f829fef36b
When we updated from 4.4.10 to 4.4.14 we copied the patches over. This changeset properly updates the patches so that they apply cleanly. 0039-VSOCK-do-not-disconnect-socket-when-peer-has-shutdow.patch was removed as it made it into 4.4.14 already. Compile tested only For reference the patches were generated from: https://github.com/rneugeba/linux-stable/tree/v4.4.14-moby Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
32 lines
918 B
Diff
32 lines
918 B
Diff
From 91e1a920c69498f37aa1278b7faf970848ab613e 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 09/40] 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 15f9595..8373709 100644
|
|
--- a/net/vmw_vsock/af_vsock.c
|
|
+++ b/net/vmw_vsock/af_vsock.c
|
|
@@ -1840,6 +1840,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.0
|
|
|