Messages in this thread Patch in this message | | | Date | Sun, 1 Dec 2019 10:39:34 +0100 | From | Greg KH <> | Subject | Re: Linux 4.4.205 |
| |
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:
| |