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

Commit c483e026 authored by Phil Sutter's avatar Phil Sutter Committed by David S. Miller
Browse files

af_packet: simplify VLAN frame check in packet_snd 



For ethernet frames, eth_type_trans() already parses the header, so one
can skip this when checking the frame size.

Signed-off-by: default avatarPhil Sutter <phil@nwl.cc>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cbd89acb

net/packet/af_packet.c

+4 −11
Original line number Diff line number Diff line
@@ -2333,24 +2333,17 @@ static int packet_snd(struct socket *sock, 


	if (dev->type == ARPHRD_ETHER) {

		skb->protocol = eth_type_trans(skb, dev);

		if (skb->protocol == htons(ETH_P_8021Q))

			reserve += VLAN_HLEN;

	} else {

		skb->protocol = proto;

		skb->dev = dev;

	}



	if (!gso_type && (len > dev->mtu + reserve + extra_len)) {

		/* Earlier code assumed this would be a VLAN pkt,

		 * double-check this now that we have the actual

		 * packet in hand.

		 */

		struct ethhdr *ehdr;

		skb_reset_mac_header(skb);

		ehdr = eth_hdr(skb);

		if (ehdr->h_proto != htons(ETH_P_8021Q)) {

		err = -EMSGSIZE;

		goto out_free;

	}

	}



	skb->priority = sk->sk_priority;

	skb->mark = sk->sk_mark;