mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-11-27 01:13:51 +00:00
605163eb1d
Some of git's whitespace fixup option corrupts the patches by (at least) stripping trailing spaces (which are present for empty lines in context) and changing leading <space><tab> into just <tab>. `patch(1)` used by the build here seems to tolerate this, but `git am` and/or `git apply` do not. Fix this up by running git am and at each failure point (i.e. every patch) applying the relevant patch using `patch(1)` (which works because `git am` was unable to even partially apply the patches) before regenerating the whole lot with `git format-patch`. Signed-off-by: Ian Campbell <ian.campbell@docker.com>
31 lines
916 B
Diff
31 lines
916 B
Diff
From c05011868782b0fbad73702161492e953eacbcbf 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.2
|
|
|