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

Commit 51846355 authored by Atzm Watanabe's avatar Atzm Watanabe Committed by David S. Miller
Browse files

packet: make aligned size of struct tpacket{2,3}_hdr clear 



struct tpacket{2,3}_hdr is aligned to a multiple of TPACKET_ALIGNMENT.
We may add members to them until current aligned size without forcing
userspace to call getsockopt(..., PACKET_HDRLEN, ...).

Signed-off-by: default avatarAtzm Watanabe <atzm@stratosphere.co.jp>
Acked-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f605acf

net/packet/af_packet.c

+7 −0
Original line number Diff line number Diff line
@@ -1812,6 +1812,13 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, 
	struct timespec ts;

	__u32 ts_status;



	/* struct tpacket{2,3}_hdr is aligned to a multiple of TPACKET_ALIGNMENT.

	 * We may add members to them until current aligned size without forcing

	 * userspace to call getsockopt(..., PACKET_HDRLEN, ...).

	 */

	BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);

	BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);



	if (skb->pkt_type == PACKET_LOOPBACK)

		goto drop;