diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-06-22 04:25:25 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-24 01:36:25 +0200 |
| commit | d55d87fdff8252d0e2f7c28c2d443aee17e9d70f (patch) | |
| tree | a4bfb0a47525672c690b63e85bf3f47f4ab014f7 /net/ax25 | |
| parent | ipv6: Use correct data types for ICMPv6 type and code (diff) | |
| download | linux-d55d87fdff8252d0e2f7c28c2d443aee17e9d70f.tar.xz linux-d55d87fdff8252d0e2f7c28c2d443aee17e9d70f.zip | |
net: Move rx skb_orphan call to where needed
In order to get the tun driver to account packets, we need to be
able to receive packets with destructors set. To be on the safe
side, I added an skb_orphan call for all protocols by default since
some of them (IP in particular) cannot handle receiving packets
destructors properly.
Now it seems that at least one protocol (CAN) expects to be able
to pass skb->sk through the rx path without getting clobbered.
So this patch attempts to fix this properly by moving the skb_orphan
call to where it's actually needed. In particular, I've added it
to skb_set_owner_[rw] which is what most users of skb->destructor
call.
This is actually an improvement for tun too since it means that
we only give back the amount charged to the socket when the skb
is passed to another socket that will also be charged accordingly.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Oliver Hartkopp <olver@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ax25')
| -rw-r--r-- | net/ax25/ax25_in.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c index 5f1d2107a1dd..de56d3983de0 100644 --- a/net/ax25/ax25_in.c +++ b/net/ax25/ax25_in.c @@ -437,8 +437,7 @@ free: int ax25_kiss_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype, struct net_device *orig_dev) { - skb->sk = NULL; /* Initially we don't know who it's for */ - skb->destructor = NULL; /* Who initializes this, dammit?! */ + skb_orphan(skb); if (!net_eq(dev_net(dev), &init_net)) { kfree_skb(skb); |