diff options
| author |   David Barmann <david.barmann@stackpath.com> | 2018-11-08 08:13:35 -0600 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-11-08 19:36:13 -0800 |
| commit | 50254256f382c56bde87d970f3d0d02fdb76ec70 (patch) | |
| tree | 5f2935d7f5a7f63b3074e5babd329d284d9797cf /net/core/sock.c | |
| parent | Merge branch 's390-qeth-next' (diff) | |
| download | linux-dev-50254256f382c56bde87d970f3d0d02fdb76ec70.tar.xz linux-dev-50254256f382c56bde87d970f3d0d02fdb76ec70.zip | |
sock: Reset dst when changing sk_mark via setsockopt
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>
Diffstat (limited to 'net/core/sock.c')
| -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 7b304e454a38..6d7e189e3cd9 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -952,10 +952,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: |