From 0d7c1e4be6d8e4615486c8846d74e1145a2a17d8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 29 Nov 2019 09:07:29 +0100 Subject: [PATCH 1/2] Revert "sock: Reset dst when changing sk_mark via setsockopt" This reverts commit 4c5ce7ca90e00164f954d727215fc227addc467c which is commit 50254256f382c56bde87d970f3d0d02fdb76ec70 upstream. It breaks a number of runtime Android networking tests, so something is wrong with the backport, or something else also needed to be backported at the same time. So I'm dropping this from the tree as regressions are not good. Cc: David Barmann Cc: Eric Dumazet Cc: David S. Miller Cc: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/core/sock.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 92d5f6232ec7..8aa4a5f89572 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: From 2810f15bcb6e4c1f7663a399488525c219ac45f3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 29 Nov 2019 09:30:25 +0100 Subject: [PATCH 2/2] Linux 4.4.205 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c2a57420c570..9f97365b4bc6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 204 +SUBLEVEL = 205 EXTRAVERSION = NAME = Blurry Fish Butt