packet: Revert recent header parsing changes. (09effa67) · Commits · 戴 / test

net/packet/af_packet.c

+24 −29

Original line number	Original line	Diff line number	Diff line
	@@ -88,7 +88,6 @@
	#include <linux/virtio_net.h>		#include <linux/virtio_net.h>
	#include <linux/errqueue.h>		#include <linux/errqueue.h>
	#include <linux/net_tstamp.h>		#include <linux/net_tstamp.h>
	#include <linux/if_arp.h>

	#ifdef CONFIG_INET		#ifdef CONFIG_INET
	#include <net/inet_common.h>		#include <net/inet_common.h>
	@@ -1924,7 +1923,7 @@ static int tpacket_fill_skb(struct packet_sock po, struct sk_buff skb,
	__be16 proto, unsigned char *addr, int hlen)		__be16 proto, unsigned char *addr, int hlen)
	{		{
	union tpacket_uhdr ph;		union tpacket_uhdr ph;
	int to_write, offset, len, tp_len, nr_frags, len_max, max_frame_len;		int to_write, offset, len, tp_len, nr_frags, len_max;
	struct socket *sock = po->sk.sk_socket;		struct socket *sock = po->sk.sk_socket;
	struct page *page;		struct page *page;
	void *data;		void *data;
	@@ -1947,6 +1946,10 @@ static int tpacket_fill_skb(struct packet_sock po, struct sk_buff skb,
	tp_len = ph.h1->tp_len;		tp_len = ph.h1->tp_len;
	break;		break;
	}		}
			if (unlikely(tp_len > size_max)) {
			pr_err("packet size is too long (%d > %d)\n", tp_len, size_max);
			return -EMSGSIZE;
			}

	skb_reserve(skb, hlen);		skb_reserve(skb, hlen);
	skb_reset_network_header(skb);		skb_reset_network_header(skb);
	@@ -2002,25 +2005,10 @@ static int tpacket_fill_skb(struct packet_sock po, struct sk_buff skb,
	if (unlikely(err))		if (unlikely(err))
	return err;		return err;

	if (dev->type == ARPHRD_ETHER)
	skb->protocol = eth_type_trans(skb, dev);

	data += dev->hard_header_len;		data += dev->hard_header_len;
	to_write -= dev->hard_header_len;		to_write -= dev->hard_header_len;
	}		}

	max_frame_len = dev->mtu + dev->hard_header_len;
	if (skb->protocol == htons(ETH_P_8021Q))
	max_frame_len += VLAN_HLEN;

	if (size_max > max_frame_len)
	size_max = max_frame_len;

	if (unlikely(tp_len > size_max)) {
	pr_err("packet size is too long (%d > %d)\n", tp_len, size_max);
	return -EMSGSIZE;
	}

	offset = offset_in_page(data);		offset = offset_in_page(data);
	len_max = PAGE_SIZE - offset;		len_max = PAGE_SIZE - offset;
	len = ((to_write > len_max) ? len_max : to_write);		len = ((to_write > len_max) ? len_max : to_write);
	@@ -2059,7 +2047,7 @@ static int tpacket_snd(struct packet_sock po, struct msghdr msg)
	struct net_device *dev;		struct net_device *dev;
	__be16 proto;		__be16 proto;
	bool need_rls_dev = false;		bool need_rls_dev = false;
	int err;		int err, reserve = 0;
	void *ph;		void *ph;
	struct sockaddr_ll saddr = (struct sockaddr_ll )msg->msg_name;		struct sockaddr_ll saddr = (struct sockaddr_ll )msg->msg_name;
	int tp_len, size_max;		int tp_len, size_max;
	@@ -2092,6 +2080,8 @@ static int tpacket_snd(struct packet_sock po, struct msghdr msg)
	if (unlikely(dev == NULL))		if (unlikely(dev == NULL))
	goto out;		goto out;

			reserve = dev->hard_header_len;

	err = -ENETDOWN;		err = -ENETDOWN;
	if (unlikely(!(dev->flags & IFF_UP)))		if (unlikely(!(dev->flags & IFF_UP)))
	goto out_put;		goto out_put;
	@@ -2099,6 +2089,9 @@ static int tpacket_snd(struct packet_sock po, struct msghdr msg)
	size_max = po->tx_ring.frame_size		size_max = po->tx_ring.frame_size
	- (po->tp_hdrlen - sizeof(struct sockaddr_ll));		- (po->tp_hdrlen - sizeof(struct sockaddr_ll));

			if (size_max > dev->mtu + reserve)
			size_max = dev->mtu + reserve;

	do {		do {
	ph = packet_current_frame(po, &po->tx_ring,		ph = packet_current_frame(po, &po->tx_ring,
	TP_STATUS_SEND_REQUEST);		TP_STATUS_SEND_REQUEST);
	@@ -2331,20 +2324,22 @@ static int packet_snd(struct socket *sock,

	sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);		sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);

	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)) {		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;		err = -EMSGSIZE;
	goto out_free;		goto out_free;
	}		}
			}

			skb->protocol = proto;
			skb->dev = dev;
	skb->priority = sk->sk_priority;		skb->priority = sk->sk_priority;
	skb->mark = sk->sk_mark;		skb->mark = sk->sk_mark;

Admin message