netdev - Re: [PATCH 3/6] usbnet: allow mini-drivers to consume L2 headers

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 03 Dec 2015 21:03:54 +0100
From:	Oliver Neukum <oneukum@...e.com>
To:	Bjørn Mork <bjorn@...k.no>
Cc:	netdev@...r.kernel.org,
	Aleksander Morgado <aleksander@...ksander.es>,
	Marcel Holtmann <marcel@...tmann.org>,
	Dan Williams <dcbw@...hat.com>, linux-usb@...r.kernel.org
Subject: Re: [PATCH 3/6] usbnet: allow mini-drivers to consume L2 headers

On Thu, 2015-12-03 at 19:24 +0100, Bjørn Mork wrote:
> Assume the minidriver has taken care of all L2 header parsing
> if it sets skb->protocol.  This allows the minidriver to
> support non-ethernet L2 headers, and even operate without
> any L2 header at all.
> 
> Signed-off-by: Bjørn Mork <bjorn@...k.no>
Acked-by: Oliver Neukum <oneukum@...e.com>
> ---
>  drivers/net/usb/usbnet.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
> index 0744bf2ef2d6..0b0ba7ef14e4 100644
> --- a/drivers/net/usb/usbnet.c
> +++ b/drivers/net/usb/usbnet.c
> @@ -324,7 +324,10 @@ void usbnet_skb_return (struct usbnet *dev, struct sk_buff *skb)
>  		return;
>  	}
>  
> -	skb->protocol = eth_type_trans (skb, dev->net);
> +	/* only update if unset to allow minidriver rx_fixup override */
> +	if (skb->protocol == 0)
> +		skb->protocol = eth_type_trans (skb, dev->net);
> +
>  	dev->net->stats.rx_packets++;
>  	dev->net->stats.rx_bytes += skb->len;
>  


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html