From: Oliver Hartkopp Date: Tue, 3 Aug 2010 07:31:48 +0000 (-0700) Subject: can-raw: Fix skb_orphan_try handling X-Git-Tag: v2.6.36-rc1~571^2~6 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cff0d6e6edac7672b3f915bb4fb59f279243b7f9;p=pandora-kernel.git can-raw: Fix skb_orphan_try handling 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 Signed-off-by: David S. Miller --- Reading git-diff-tree failed