diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-07 16:48:33 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-08 04:26:52 -0700 |
| commit | 850dcc4d4dd7d5da5c1b2a780c5e649c3b649545 (patch) | |
| tree | 623983d4d59ea7de05c200006e112e2640d4fb2c /net/ipv4/ip_output.c | |
| parent | fd2874b3bbe832e90ac480971a7a8bd736b629b9 (diff) | |
| download | linux-850dcc4d4dd7d5da5c1b2a780c5e649c3b649545.tar.gz linux-850dcc4d4dd7d5da5c1b2a780c5e649c3b649545.tar.bz2 linux-850dcc4d4dd7d5da5c1b2a780c5e649c3b649545.zip | |
ipv4: Fix ip_queue_xmit to pass sk into ip_local_out_sk
After a packet has been encapsulated by a tunnel we should use the
tunnel sockets local multicast loopback flag to control if the
encapsulated packet should be locally loopback back.
Pass sk into ip_local_out_sk so that in the rare case we are dealing
with a tunneled packet whose tunnel destination address is a multicast
address the kernel properly decides to loopback this packet.
In practice I don't think this matters as ip_queue_xmit is used by
tcp, l2tp and sctp none of which I am aware of uses ip level
multicasting as they are all point to point communications protocols.
Let's fix this before someone uses ip_queue_xmit for a tunnel protocol
that does use multicast.
Fixes: aad88724c9d5 ("ipv4: add a sock pointer to dst->output() path.")
Fixes: b0270e91014d ("ipv4: add a sock pointer to ip_queue_xmit()")
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 6cb585a05dd1..1030f48d66e1 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -460,7 +460,7 @@ packet_routed: skb->priority = sk->sk_priority; skb->mark = sk->sk_mark; - res = ip_local_out(skb); + res = ip_local_out_sk(sk, skb); rcu_read_unlock(); return res; |