netdev - Re: [PATCH ipsec 2/3] ipv6: xfrm: dereference inner ipv6 header if encapsulated

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] [day] [month] [year] [list]

Date:	Sat, 17 Aug 2013 21:53:00 +0200
From:	Hannes Frederic Sowa <hannes@...essinduktion.org>
To:	Eric Dumazet <eric.dumazet@...il.com>
Cc:	netdev@...r.kernel.org, steffen.klassert@...unet.com
Subject: Re: [PATCH ipsec 2/3] ipv6: xfrm: dereference inner ipv6 header if encapsulated

On Sat, Aug 17, 2013 at 12:03:54PM -0700, Eric Dumazet wrote:
> On Sat, 2013-08-17 at 19:51 +0200, Hannes Frederic Sowa wrote:
> > In xfrm6_local_error use inner_header if the packet was encapsulated.
> > 
> > Cc: Steffen Klassert <steffen.klassert@...unet.com>
> > Signed-off-by: Hannes Frederic Sowa <hannes@...essinduktion.org>
> > ---
> > 
> > This patch is based on Steffen Klassert's ipsec tree. 
> > 
> >  net/ipv6/xfrm6_output.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
> > index 3ac5ab2..45effcc 100644
> > --- a/net/ipv6/xfrm6_output.c
> > +++ b/net/ipv6/xfrm6_output.c
> > @@ -59,10 +59,12 @@ static void xfrm6_local_rxpmtu(struct sk_buff *skb, u32 mtu)
> >  void xfrm6_local_error(struct sk_buff *skb, u32 mtu)
> >  {
> >  	struct flowi6 fl6;
> > +	struct ipv6hdr *hdr;
> >  	struct sock *sk = skb->sk;
> >  
> > +	hdr = skb->encapsulation ? inner_ipv6_hdr(skb) : ipv6_hdr(skb);
> >  	fl6.fl6_dport = inet_sk(sk)->inet_dport;
> > -	fl6.daddr = ipv6_hdr(skb)->daddr;
> > +	fl6.daddr = hdr->daddr;
> >  
> >  	ipv6_local_error(sk, EMSGSIZE, &fl6, mtu);
> >  }
> 
> You could have use "const struct ipv6hdr *hdr;", but otherwise :

Thanks for the review, Eric!

I do think such details matter, so I'll respin this series by tomorrow.

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