Merge 4.9.205 into android-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>
diff --git a/Makefile b/Makefile
index 03fd98b..c571fb1 100644
--- a/Makefile
+++ b/Makefile
@@ -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 8603fc3..2d78b7c 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -945,12 +945,10 @@
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: