diff options
| author | Eric W. Biederman | 2015-10-07 23:48:32 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-10-08 13:26:52 +0200 |
| commit | fd2874b3bbe832e90ac480971a7a8bd736b629b9 (patch) | |
| tree | 33640db1c1474a00defca1b810fc2208de415309 /net/ipv4 | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh... (diff) | |
| download | kernel-qcow2-linux-fd2874b3bbe832e90ac480971a7a8bd736b629b9.tar.gz kernel-qcow2-linux-fd2874b3bbe832e90ac480971a7a8bd736b629b9.tar.xz kernel-qcow2-linux-fd2874b3bbe832e90ac480971a7a8bd736b629b9.zip | |
ipv4: Fix ip_local_out_sk by passing the sk into __ip_local_out_sk
In the rare case where sk != skb->sk ip_local_out_sk arranges
to call dst->output differently if the skb is queued or not.
This is a bug.
Fix this bug by passing the sk parameter of ip_local_out_sk through
from ip_local_out_sk to __ip_local_out_sk (skipping __ip_local_out).
Fixes: 7026b1ddb6b8 ("netfilter: Pass socket pointer down through okfn().")
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -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 911ea739049a..6cb585a05dd1 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -117,7 +117,7 @@ int ip_local_out_sk(struct sock *sk, struct sk_buff *skb) { int err; - err = __ip_local_out(skb); + err = __ip_local_out_sk(sk, skb); if (likely(err == 1)) err = dst_output(sk, skb); |