netdev - Re: [PATCH net-next 04/13] ip_tunnels: add IPv6 addresses to ip_tunnel

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]

Message-ID: <20150819100930.2dd9eb59@griffin>
Date:	Wed, 19 Aug 2015 10:09:30 +0200
From:	Jiri Benc <jbenc@...hat.com>
To:	Alexei Starovoitov <alexei.starovoitov@...il.com>
Cc:	netdev@...r.kernel.org, Thomas Graf <tgraf@...g.ch>
Subject: Re: [PATCH net-next 04/13] ip_tunnels: add IPv6 addresses to
 ip_tunnel_key

On Tue, 18 Aug 2015 17:36:32 -0700, Alexei Starovoitov wrote:
> please add commit message. +47 -32 cannot be empty.

The patch seemed rather trivial to me (it's basically "->key.ipv4_" to
"->keu.u.ipv4." conversion plus one new memset) but sure, I'll add a
few words.

It probably does not qualify as trivial if one can make a bug in it :-)

> > +/* Used to memset ipv4 address padding. */
> > +#define IP_TUNNEL_KEY_IPV4_PAD	offsetofend(struct ip_tunnel_key, u.ipv4.dst)
> > +#define IP_TUNNEL_KEY_IPV4_PAD_LEN				\
> > +	(FIELD_SIZEOF(struct ip_tunnel_key, u) - IP_TUNNEL_KEY_IPV4_PAD)
> > +
> >  struct ip_tunnel_key {
> >  	__be64			tun_id;
> > -	__be32			ipv4_src;
> > -	__be32			ipv4_dst;
> > +	union {
> > +		struct {
> > +			__be32	src;
> > +			__be32	dst;
> > +		} ipv4;
> > +		struct {
> > +			struct in6_addr src;
> > +			struct in6_addr dst;
> > +		} ipv6;
> > +	} u;
> ...
> > +	tun_info->key.u.ipv4.src = saddr;
> > +	tun_info->key.u.ipv4.dst = daddr;
> > +	memset((unsigned char *)&tun_info->key + IP_TUNNEL_KEY_IPV4_PAD,
> > +	       0, IP_TUNNEL_KEY_IPV4_PAD_LEN);
> 
> the math looks wrong.
> IP_TUNNEL_KEY_IPV4_PAD_LEN = sizeof(u) - offsetofend(u.ipv4.dst)
> 8 byte mistake?

Yes, thanks a lot for catching this.

 Jiri

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