diff options
| author | Srinivasarao P <spathi@codeaurora.org> | 2019-12-02 10:59:38 +0530 |
|---|---|---|
| committer | Srinivasarao P <spathi@codeaurora.org> | 2019-12-02 11:00:55 +0530 |
| commit | 18d188341eb6028698349b8df17abbad05223945 (patch) | |
| tree | f34239d2cd10f2dc81909e56b41a69aecfa6ada9 /net | |
| parent | ed0754412226e593ffccb7990b18eb4914ac77e7 (diff) | |
| parent | 516978792f577954ab0d362ba0b62f755e42e664 (diff) | |
Merge android-4.4-p.205 (5169787) into msm-4.4
* refs/heads/tmp-5169787
Linux 4.4.205
Revert "sock: Reset dst when changing sk_mark via setsockopt"
Change-Id: Ie26ad8dcfbd68087b16b26e7c1004e8f2c934e66
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Diffstat (limited to 'net')
| -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 1f8e7a2b136c..14dcc631f922 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: |