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

Commit 4760229b authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

net/packet: annotate accesses to po->xmit 



[ Upstream commit b9d83ab8a708f23a4001d60e9d8d0b3be3d9f607 ]

po->xmit can be set from setsockopt(PACKET_QDISC_BYPASS),
while read locklessly.

Use READ_ONCE()/WRITE_ONCE() to avoid potential load/store
tearing issues.

Fixes: d346a3fa ("packet: introduce PACKET_QDISC_BYPASS socket option")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 47464e0c

net/packet/af_packet.c

+8 −4
Original line number Diff line number Diff line
@@ -266,7 +266,8 @@ static void packet_cached_dev_reset(struct packet_sock *po) 


static bool packet_use_direct_xmit(const struct packet_sock *po)

{

	return po->xmit == packet_direct_xmit;

	/* Paired with WRITE_ONCE() in packet_setsockopt() */

	return READ_ONCE(po->xmit) == packet_direct_xmit;

}



static u16 packet_pick_tx_queue(struct sk_buff *skb)
@@ -2799,7 +2800,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) 
		packet_inc_pending(&po->tx_ring);



		status = TP_STATUS_SEND_REQUEST;

		err = po->xmit(skb);

		/* Paired with WRITE_ONCE() in packet_setsockopt() */

		err = READ_ONCE(po->xmit)(skb);

		if (unlikely(err != 0)) {

			if (err > 0)

				err = net_xmit_errno(err);
@@ -3002,7 +3004,8 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) 
		virtio_net_hdr_set_proto(skb, &vnet_hdr);

	}



	err = po->xmit(skb);

	/* Paired with WRITE_ONCE() in packet_setsockopt() */

	err = READ_ONCE(po->xmit)(skb);

	if (unlikely(err != 0)) {

		if (err > 0)

			err = net_xmit_errno(err);
@@ -3949,7 +3952,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv 
		if (copy_from_user(&val, optval, sizeof(val)))

			return -EFAULT;



		po->xmit = val ? packet_direct_xmit : dev_queue_xmit;

		/* Paired with all lockless reads of po->xmit */

		WRITE_ONCE(po->xmit, val ? packet_direct_xmit : dev_queue_xmit);

		return 0;

	}

	default: