diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2019-11-29 10:02:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2019-11-29 10:02:53 +0100 |
| commit | 0a1e6a56946b6564d85205801de44011b183124f (patch) | |
| tree | a4fdc63f0c324a11486c99a0c69884ef99a44e4b | |
| parent | f1432cf80cb1a0bf2295e01414d713abc4f08291 (diff) | |
| parent | 6620daa748cbad3de5824143e107a9a545f3c1df (diff) | |
Merge 4.9.205 into android-4.9-pASB-2019-12-05_4.9-p
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: |