diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-01-26 01:04:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-01-26 01:04:55 -0800 |
| commit | e89862f4c5b3c4ac9afcd8cb1365d2f1e16ddc3b (patch) | |
| tree | f402fe7326021a371e11c2c59b7aaf1b12d300d3 /net/ipv4/ip_output.c | |
| parent | d5e76b0a280f71b20bdd20d1c1b4d6812ceb8c3a (diff) | |
| download | kernel_samsung_aries-e89862f4c5b3c4ac9afcd8cb1365d2f1e16ddc3b.zip kernel_samsung_aries-e89862f4c5b3c4ac9afcd8cb1365d2f1e16ddc3b.tar.gz kernel_samsung_aries-e89862f4c5b3c4ac9afcd8cb1365d2f1e16ddc3b.tar.bz2 | |
[TCP]: Restore SKB socket owner setting in tcp_transmit_skb().
Revert 931731123a103cfb3f70ac4b7abfc71d94ba1f03
We can't elide the skb_set_owner_w() here because things like certain
netfilter targets (such as owner MATCH) need a socket to be set on the
SKB for correct operation.
Thanks to Jan Engelhardt and other netfilter list members for
pointing this out.
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index f071f84..a0f2008 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -281,8 +281,9 @@ int ip_output(struct sk_buff *skb) !(IPCB(skb)->flags & IPSKB_REROUTED)); } -int ip_queue_xmit(struct sk_buff *skb, struct sock *sk, int ipfragok) +int ip_queue_xmit(struct sk_buff *skb, int ipfragok) { + struct sock *sk = skb->sk; struct inet_sock *inet = inet_sk(sk); struct ip_options *opt = inet->opt; struct rtable *rt; |