]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
can-raw: Fix skb_orphan_try handling
authorOliver Hartkopp <socketcan@hartkopp.net>
Tue, 3 Aug 2010 07:31:48 +0000 (00:31 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 26 Aug 2010 23:46:18 +0000 (16:46 -0700)
commita5f18b1cca50987eb7773bb0be0d8730dfb10306
tree891b228c64bf77e6d1fd310ae9dfc21bb616cfbc
parent59ea469c637e35604a6989a933b33883b1fcb0ab
can-raw: Fix skb_orphan_try handling

commit cff0d6e6edac7672b3f915bb4fb59f279243b7f9 upstream.

Commit fc6055a5ba31e2c14e36e8939f9bf2b6d586a7f5 (net: Introduce
skb_orphan_try()) allows an early orphan of the skb and takes care on
tx timestamping, which needs the sk-reference in the skb on driver level.
So does the can-raw socket, which has not been taken into account here.

The patch below adds a 'prevent_sk_orphan' bit in the skb tx shared info,
which fixes the problem discovered by Matthias Fuchs here:

      http://marc.info/?t=128030411900003&r=1&w=2

Even if it's not a primary tx timestamp topic it fits well into some skb
shared tx context. Or should be find a different place for the information to
protect the sk reference until it reaches the driver level?

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
include/linux/skbuff.h
net/can/raw.c