diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2019-11-29 09:42:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2019-11-29 09:42:30 +0100 |
| commit | 95dbd4a75b60d34fd58e52d65c496bb8aed766f8 (patch) | |
| tree | b3b47cc4b9139360e83f7171b03a0fe94039bf68 | |
| parent | eab6ae2052e48005984c9e5e89049f119d825ccc (diff) | |
| parent | 2810f15bcb6e4c1f7663a399488525c219ac45f3 (diff) | |
| download | common-95dbd4a75b60d34fd58e52d65c496bb8aed766f8.tar.gz | |
Merge 4.4.205 into android-4.4-oASB-2019-12-05_4.4-o
Changes in 4.4.205
Revert "sock: Reset dst when changing sk_mark via setsockopt"
Linux 4.4.205
Change-Id: I03454f81af5d2fc3da084d345efc8ad7b8eed6d8
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 = 4 -SUBLEVEL = 204 +SUBLEVEL = 205 EXTRAVERSION = NAME = Blurry Fish Butt 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: |