diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2019-11-29 10:03:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2019-11-29 10:03:20 +0100 |
| commit | a36b5017c810d27cab3fcb8e732d302af8fd6e27 (patch) | |
| tree | 94f74c9c4fe621165cab32ef38f6a6b4e88f3a07 | |
| parent | 72e859877ae59f10fbbea0658f57643d429c6bc6 (diff) | |
| parent | 6620daa748cbad3de5824143e107a9a545f3c1df (diff) | |
Merge 4.9.205 into android-4.9-qASB-2019-12-05_4.9-q
Changes in 4.9.205
Revert "sock: Reset dst when changing sk_mark via setsockopt"
Linux 4.9.205
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | net/core/sock.c | 6 |
2 files changed, 3 insertions, 5 deletions
@@ -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 8603fc360f33..2d78b7c18e64 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -945,12 +945,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: |