Commit fd2874b3 authored Oct 07, 2015 by Eric W. Biederman Committed by David S. Miller Oct 08, 2015

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: 7026b1dd ("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>

parent e28383dd

net/ipv4/ip_output.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message