diff options
| author | Pablo Neira <pablo@netfilter.org> | 2017-01-26 22:56:21 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-18 15:11:44 +0100 |
| commit | 0d4c19ee68c91f46905cbd393939d89237e6189c (patch) | |
| tree | e34a87f7f509d7f57ebc163047442ad2452bf7a5 /net/sctp/ipv6.c | |
| parent | 0e0751cdfa466923218ff59a8624fa8d1050b6fb (diff) | |
| download | linux-stable-0d4c19ee68c91f46905cbd393939d89237e6189c.tar.gz linux-stable-0d4c19ee68c91f46905cbd393939d89237e6189c.tar.bz2 linux-stable-0d4c19ee68c91f46905cbd393939d89237e6189c.zip | |
tcp: don't annotate mark on control socket from tcp_v6_send_response()
commit 92e55f412cffd016cc245a74278cb4d7b89bb3bc upstream.
Unlike ipv4, this control socket is shared by all cpus so we cannot use
it as scratchpad area to annotate the mark that we pass to ip6_xmit().
Add a new parameter to ip6_xmit() to indicate the mark. The SCTP socket
family caches the flowi6 structure in the sctp_transport structure, so
we cannot use to carry the mark unless we later on reset it back, which
I discarded since it looks ugly to me.
Fixes: bf99b4ded5f8 ("tcp: fix mark propagation with fwmark_reflect enabled")
Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sctp/ipv6.c')
| -rw-r--r-- | net/sctp/ipv6.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 176af3080a2b..6a2532dd31c4 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -222,7 +222,8 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport) SCTP_INC_STATS(sock_net(sk), SCTP_MIB_OUTSCTPPACKS); rcu_read_lock(); - res = ip6_xmit(sk, skb, fl6, rcu_dereference(np->opt), np->tclass); + res = ip6_xmit(sk, skb, fl6, sk->sk_mark, rcu_dereference(np->opt), + np->tclass); rcu_read_unlock(); return res; } |