1 |
commit: 41a360fb4db13353341fc13ec351884b1eab16cc |
2 |
Author: Thomas Deutschmann <whissi <AT> whissi <DOT> de> |
3 |
AuthorDate: Fri Nov 29 21:39:47 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 29 21:39:47 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=41a360fb |
7 |
|
8 |
Linux patch 4.9.205 |
9 |
|
10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> whissi.de> |
11 |
|
12 |
1204_linux-4.9.205.patch | 31 +++++++++++++++++++++++++++++++ |
13 |
1 file changed, 31 insertions(+) |
14 |
|
15 |
diff --git a/1204_linux-4.9.205.patch b/1204_linux-4.9.205.patch |
16 |
new file mode 100644 |
17 |
index 0000000..f0df919 |
18 |
--- /dev/null |
19 |
+++ b/1204_linux-4.9.205.patch |
20 |
@@ -0,0 +1,31 @@ |
21 |
+diff --git a/Makefile b/Makefile |
22 |
+index 0234869784fa..fc1a58ef7e56 100644 |
23 |
+--- a/Makefile |
24 |
++++ b/Makefile |
25 |
+@@ -1,6 +1,6 @@ |
26 |
+ VERSION = 4 |
27 |
+ PATCHLEVEL = 9 |
28 |
+-SUBLEVEL = 204 |
29 |
++SUBLEVEL = 205 |
30 |
+ EXTRAVERSION = |
31 |
+ NAME = Roaring Lionus |
32 |
+ |
33 |
+diff --git a/net/core/sock.c b/net/core/sock.c |
34 |
+index 9178c1654375..d22493351407 100644 |
35 |
+--- a/net/core/sock.c |
36 |
++++ b/net/core/sock.c |
37 |
+@@ -945,12 +945,10 @@ set_rcvbuf: |
38 |
+ clear_bit(SOCK_PASSSEC, &sock->flags); |
39 |
+ break; |
40 |
+ case SO_MARK: |
41 |
+- if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) { |
42 |
++ if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) |
43 |
+ ret = -EPERM; |
44 |
+- } else if (val != sk->sk_mark) { |
45 |
++ else |
46 |
+ sk->sk_mark = val; |
47 |
+- sk_dst_reset(sk); |
48 |
+- } |
49 |
+ break; |
50 |
+ |
51 |
+ case SO_RXQ_OVFL: |