Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26bd4e2d authored by Cliff Spradlin's avatar Cliff Spradlin Committed by Jeff Kirsher
Browse files

igb: protect TX timestamping from API misuse 



HW timestamping can only be requested for a packet if the NIC is first
setup via ioctl(SIOCSHWTSTAMP). If this step was skipped, then the igb
driver still allowed TX packets to request HW timestamping. In this
situation, the _IGB_PTP_TX_IN_PROGRESS flag was set and would never
clear. This prevented any future HW timestamping requests to succeed.

Fix this by checking that the NIC is configured for HW TX timestamping
before accepting a HW TX timestamping request.

Signed-off-by: default avatarCliff Spradlin <cspradlin@google.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 94221ae7

drivers/net/ethernet/intel/igb/igb_main.c

+2 −1
Original line number Diff line number Diff line
@@ -5380,7 +5380,8 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb, 
	if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {

		struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);



		if (!test_and_set_bit_lock(__IGB_PTP_TX_IN_PROGRESS,

		if (adapter->tstamp_config.tx_type & HWTSTAMP_TX_ON &&

		    !test_and_set_bit_lock(__IGB_PTP_TX_IN_PROGRESS,

					   &adapter->state)) {

			skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;

			tx_flags |= IGB_TX_FLAGS_TSTAMP;