diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2019-11-29 09:42:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2019-11-29 09:42:58 +0100 |
| commit | 516978792f577954ab0d362ba0b62f755e42e664 (patch) | |
| tree | f7efa4724a06e849b8c6a1d3c4b8050836014c27 /net/core/sock.c | |
| parent | 583bdda5eaa0262e3331a3d1ae3b66b24bd20d3e (diff) | |
| parent | 2810f15bcb6e4c1f7663a399488525c219ac45f3 (diff) | |
Merge 4.4.205 into android-4.4-p
Changes in 4.4.205
Revert "sock: Reset dst when changing sk_mark via setsockopt"
Linux 4.4.205
Change-Id: Idf9798de380712271babf65554ecc4251ea744f0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 72f54ca95ccd..8f2f5d497dc7 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: |