commit:     b21d02e0a96bb1073e273702e7e23c8c14bbc4f3
Author:     Thomas Deutschmann <whissi <AT> whissi <DOT> de>
AuthorDate: Fri Nov 29 21:41:07 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Nov 29 21:41:07 2019 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=b21d02e0

Linux patch 4.4.205

Signed-off-by: Thomas Deutschmann <whissi <AT> whissi.de>

 1204_linux-4.4.205.patch | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/1204_linux-4.4.205.patch b/1204_linux-4.4.205.patch
new file mode 100644
index 0000000..ac6232f
--- /dev/null
+++ b/1204_linux-4.4.205.patch
@@ -0,0 +1,31 @@
+diff --git a/Makefile b/Makefile
+index c2a57420c570..9f97365b4bc6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+ VERSION = 4
+ PATCHLEVEL = 4
+-SUBLEVEL = 204
++SUBLEVEL = 205
+ EXTRAVERSION =
+ NAME = Blurry Fish Butt
+ 
+diff --git a/net/core/sock.c b/net/core/sock.c
+index 92d5f6232ec7..8aa4a5f89572 100644
+--- a/net/core/sock.c
++++ b/net/core/sock.c
+@@ -951,12 +951,10 @@ set_rcvbuf:
+                       clear_bit(SOCK_PASSSEC, &sock->flags);
+               break;
+       case SO_MARK:
+-              if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) {
++              if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN))
+                       ret = -EPERM;
+-              } else if (val != sk->sk_mark) {
++              else
+                       sk->sk_mark = val;
+-                      sk_dst_reset(sk);
+-              }
+               break;
+ 
+       case SO_RXQ_OVFL:

Reply via email to