netdev - Re: [PATCH] packet: Deliver VLAN TPID to userspace

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:	Mon, 21 Oct 2013 10:24:54 +0100
From:	Ben Hutchings <bhutchings@...arflare.com>
To:	Atzm Watanabe <atzm@...atosphere.co.jp>
CC:	Stephen Hemminger <stephen@...workplumber.org>,
	<netdev@...r.kernel.org>
Subject: Re: [PATCH] packet: Deliver VLAN TPID to userspace

On Sat, 2013-10-19 at 15:19 +0900, Atzm Watanabe wrote:
> At Fri, 18 Oct 2013 10:56:55 -0700,
> Stephen Hemminger wrote:
> > 
> > On Sat, 19 Oct 2013 02:08:11 +0900
> > Atzm Watanabe <atzm@...atosphere.co.jp> wrote:
> > 
> > > diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h
> > > index dbf0666..6e36e0a 100644
> > > --- a/include/uapi/linux/if_packet.h
> > > +++ b/include/uapi/linux/if_packet.h
> > > @@ -83,7 +83,7 @@ struct tpacket_auxdata {
> > >  	__u16		tp_mac;
> > >  	__u16		tp_net;
> > >  	__u16		tp_vlan_tci;
> > > -	__u16		tp_padding;
> > > +	__u16		tp_vlan_tpid;
> > >  };
> > >  
> > >  /* Rx ring - header status */
> > > @@ -132,12 +132,13 @@ struct tpacket2_hdr {
> > >  	__u32		tp_sec;
> > >  	__u32		tp_nsec;
> > >  	__u16		tp_vlan_tci;
> > > -	__u16		tp_padding;
> > > +	__u16		tp_vlan_tpid;
> > >  };
> > >  
> > >  struct tpacket_hdr_variant1 {
> > >  	__u32	tp_rxhash;
> > >  	__u32	tp_vlan_tci;
> > > +	__u32	tp_vlan_tpid;
> > >  };
> > 
> > The last change will break ABI to userspace applications.
> > You can reuse padding elements; but you can't increase (or shrink)
> > an existing structure.
> 
> Thank you for pointing.
> But I have two questions:
> 
>   - The patch that increases existing structures was posted and
>     accepted in the past (e.g 393e52e33c6c26ec7db290dab803bac1bed962d4
>     "packet: deliver VLAN TCI to userspace").
>     What is the difference between them and my patch?

struct tpacket_auxdata is allowed to grow as it will be written/read
using the cmsg API where the length of each structure is explicit at
run-time.

>   - I tested using tools/testing/selftests/net/psock_tpacket.c built
>     before applying my patch, and all test cases were passed.
>     Also I tested by the code that was listed in
>     Documentation/networking/packet_mmap.txt "AF_PACKET TPACKET_V3
>     example".  It seems that problem was not caused.
>     What situation causes the problem that you assumed?

Yes, it looks like it would be safe to grow struct tpacket3_hdr too, as
the length is also explicit at run-time.

(And TPACKET{1,2,3}_HDRLEN should be removed from
include/uapi/linux/if_packet.h, as they are not relevant to userland.)

Ben.

-- 
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.

--
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