From: Steffen Klassert Subject: Re: [PATCH ipsec] xfrm: refine validation of template and selector families Date: Fri, 11 Jan 2019 09:41:51 +0100 Message-ID: <20190111084151.GC3581@gauss3.secunet.de> References: <20190109133734.6482-1-fw@strlen.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Cc: <3ntr0py1337@gmail.com>, , To: Florian Westphal Return-path: Received: from a.mx.secunet.com ([62.96.220.36]:54158 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725267AbfAKIly (ORCPT ); Fri, 11 Jan 2019 03:41:54 -0500 Content-Disposition: inline In-Reply-To: <20190109133734.6482-1-fw@strlen.de> Sender: netdev-owner@vger.kernel.org List-ID: On Wed, Jan 09, 2019 at 02:37:34PM +0100, Florian Westphal wrote: > The check assumes that in transport mode, the first templates family > must match the address family of the policy selector. > > Syzkaller managed to build a template using MODE_ROUTEOPTIMIZATION, > with ipv4-in-ipv6 chain, leading to following splat: > > BUG: KASAN: stack-out-of-bounds in xfrm_state_find+0x1db/0x1854 > Read of size 4 at addr ffff888063e57aa0 by task a.out/2050 > xfrm_state_find+0x1db/0x1854 > xfrm_tmpl_resolve+0x100/0x1d0 > xfrm_resolve_and_create_bundle+0x108/0x1000 [..] > > Problem is that addresses point into flowi4 struct, but xfrm_state_find > treats them as being ipv6 because it uses templ->encap_family is used > (AF_INET6 in case of reproducer) rather than family (AF_INET). > > This patch inverts the logic: Enforce 'template family must match > selector' EXCEPT for tunnel and BEET mode. > > In BEET and Tunnel mode, xfrm_tmpl_resolve_one will have remote/local > address pointers changed to point at the addresses found in the template, > rather than the flowi ones, so no oob read will occur. > > Reported-by: 3ntr0py1337@gmail.com > Reported-by: Daniel Borkmann > Signed-off-by: Florian Westphal Applied, thanks Florian!