diff options
| author | David Barmann <david.barmann@stackpath.com> | 2018-11-08 08:13:35 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-28 18:29:01 +0100 |
| commit | 597b389bd8d496c050b7a02058702d27bf0ae3fa (patch) | |
| tree | 969c92c8e116ef76dec41015e3ce3611f635c32c | |
| parent | 23fd22e304fe26c3ea0ebc47f7a8bf19b1eb858d (diff) | |
| download | linux-stable-597b389bd8d496c050b7a02058702d27bf0ae3fa.tar.gz linux-stable-597b389bd8d496c050b7a02058702d27bf0ae3fa.tar.bz2 linux-stable-597b389bd8d496c050b7a02058702d27bf0ae3fa.zip | |
sock: Reset dst when changing sk_mark via setsockopt
[ Upstream commit 50254256f382c56bde87d970f3d0d02fdb76ec70 ]
When setting the SO_MARK socket option, if the mark changes, the dst
needs to be reset so that a new route lookup is performed.
This fixes the case where an application wants to change routing by
setting a new sk_mark. If this is done after some packets have already
been sent, the dst is cached and has no effect.
Signed-off-by: David Barmann <david.barmann@stackpath.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/core/sock.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index d22493351407..9178c1654375 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -945,10 +945,12 @@ 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 + } else if (val != sk->sk_mark) { sk->sk_mark = val; + sk_dst_reset(sk); + } break; case SO_RXQ_OVFL: |