* Linux 4.4.205
@ 2019-12-01 9:39 Greg KH
2019-12-01 9:39 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Greg KH @ 2019-12-01 9:39 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, torvalds, stable; +Cc: lwn, Jiri Slaby
I'm announcing the release of the 4.4.205 kernel.
All users of the 4.4 kernel series must upgrade.
The updated 4.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 +-
net/core/sock.c | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
Greg Kroah-Hartman (2):
Revert "sock: Reset dst when changing sk_mark via setsockopt"
Linux 4.4.205
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Linux 4.4.205
2019-12-01 9:39 Linux 4.4.205 Greg KH
@ 2019-12-01 9:39 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2019-12-01 9:39 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, torvalds, stable; +Cc: lwn, Jiri Slaby
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:
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-01 9:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-01 9:39 Linux 4.4.205 Greg KH
2019-12-01 9:39 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).