]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
net: hold sock reference while processing tx timestamps
authorRichard Cochran <richardcochran@gmail.com>
Fri, 21 Oct 2011 00:49:15 +0000 (00:49 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Oct 2011 06:54:50 +0000 (02:54 -0400)
commitda92b194cc36b5dc1fbd85206aeeffd80bee0c39
tree375ead604156d8a8afc5ecef8d76415e999ce903
parentf7ff19871bb4a3451e1ca2cf660bf633018cfbec
net: hold sock reference while processing tx timestamps

The pair of functions,

 * skb_clone_tx_timestamp()
 * skb_complete_tx_timestamp()

were designed to allow timestamping in PHY devices. The first
function, called during the MAC driver's hard_xmit method, identifies
PTP protocol packets, clones them, and gives them to the PHY device
driver. The PHY driver may hold onto the packet and deliver it at a
later time using the second function, which adds the packet to the
socket's error queue.

As pointed out by Johannes, nothing prevents the socket from
disappearing while the cloned packet is sitting in the PHY driver
awaiting a timestamp. This patch fixes the issue by taking a reference
on the socket for each such packet. In addition, the comments
regarding the usage of these function are expanded to highlight the
rule that PHY drivers must use skb_complete_tx_timestamp() to release
the packet, in order to release the socket reference, too.

These functions first appeared in v2.6.36.

Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
Cc: <stable@vger.kernel.org>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/phy.h
include/linux/skbuff.h
net/core/timestamping.c