[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20191201094029.GB3788378@kroah.com>
Date: Sun, 1 Dec 2019 10:40:29 +0100
From: Greg KH <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org,
Andrew Morton <akpm@...ux-foundation.org>,
torvalds@...ux-foundation.org, stable@...r.kernel.org
Cc: lwn@....net, Jiri Slaby <jslaby@...e.cz>
Subject: Re: Linux 4.9.205
diff --git a/Makefile b/Makefile
index 0234869784fa..fc1a58ef7e56 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 9
-SUBLEVEL = 204
+SUBLEVEL = 205
EXTRAVERSION =
NAME = Roaring Lionus
diff --git a/net/core/sock.c b/net/core/sock.c
index 9178c1654375..d22493351407 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -945,12 +945,10 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
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:
Powered by blists - more mailing lists