Received: by 2002:a25:86ce:0:0:0:0:0 with SMTP id y14csp887857ybm; Tue, 21 May 2019 05:24:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqwXjAoCijiDCWGrAAtpRuXqOsy8S2LmMCwXNv6ygZcEfeM3gmiPT323H9lRTemPre3YsXxZ X-Received: by 2002:aa7:90d3:: with SMTP id k19mr85288242pfk.1.1558441455110; Tue, 21 May 2019 05:24:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558441455; cv=none; d=google.com; s=arc-20160816; b=axeuZqTVUfylJ0I4Nq6aCTJMLFAb7siI6FmWVvG7ZR8b3nORkytGj3qcc/XLAin4O5 nNwYvlO1u1EHExw0lhqhNGf7dukvEzkTNiEh7YV9LbmSoBjYkYBKFE5VweFEqpm0qeG/ Jxhs4SDIFV9bUEpNRzWnWRADTY7DmC2ZpzUVB5yjOlswBo3WJzl58bsLVY3OTHQFQFfH uZ3tbPaUyLaHYtb0g+VbjazslzYoHC+0nleC8hre9osFHYbSYg9SPa9V7UcvADtsDM5j JwK9g9+rrCktP6vs79iVoB92dCTrA0CJfdbvcleCJWSFQfThhnELCriesRdI8qEuiE+f IsrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=0cmaUuiH9GtD1lABno0mB3LQWbB3j1DZMaurRwK4+gI=; b=rJZYeMSaBjpQvNK9woAp50LDjj2h5TcPiyu7u6UQ88k8CjoGo/DJpa4zrZOu/Ljr14 HTnaqB/7s+lBRAv7+jBJZbHHAq+Ap40mduZUYBJcdmO9hCdq3KxG33MZZHCa97k4eQJ9 rWCqSwqsnzRQ6tRKiLtMbN3ip9qBReyg+TL3E3b6eDhm/fBOM/FCXZa1mEO6q720LIO8 ULKPi5yqW21qLiNOjIrCE4nP148zcsyC0SzYXDTxWs9v3xnKYAbKcXFvsV/fgKjtRgsn JitGEPIP1UywFn8BxDmmmH6ac+chYkp2VvBpF2GzkNOItS09Yb2H+x3ccIdbXwpp0Gf4 AXSg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 63si21403028ple.154.2019.05.21.05.23.59; Tue, 21 May 2019 05:24:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727969AbfEUMWz (ORCPT + 99 others); Tue, 21 May 2019 08:22:55 -0400 Received: from helcar.hmeau.com ([216.24.177.18]:58716 "EHLO deadmen.hmeau.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726448AbfEUMWz (ORCPT ); Tue, 21 May 2019 08:22:55 -0400 Received: from gondobar.mordor.me.apana.org.au ([192.168.128.4] helo=gondobar) by deadmen.hmeau.com with esmtps (Exim 4.89 #2 (Debian)) id 1hT3n4-00016s-0Q; Tue, 21 May 2019 20:22:46 +0800 Received: from herbert by gondobar with local (Exim 4.89) (envelope-from ) id 1hT3mw-0003Hs-T0; Tue, 21 May 2019 20:22:38 +0800 Date: Tue, 21 May 2019 20:22:38 +0800 From: Herbert Xu To: Anirudh Gupta Cc: Steffen Klassert , Anirudh Gupta , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH net] xfrm: Fix xfrm sel prefix length validation Message-ID: <20190521122238.qip43s44pgl7ihea@gondor.apana.org.au> References: <20190521082247.67732-1-anirudh.gupta@sophos.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190521082247.67732-1-anirudh.gupta@sophos.com> User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 21, 2019 at 01:52:47PM +0530, Anirudh Gupta wrote: > Family of src/dst can be different from family of selector src/dst. > Use xfrm selector family to validate address prefix length, > while verifying new sa from userspace. > > Validated patch with this command: > ip xfrm state add src 1.1.6.1 dst 1.1.6.2 proto esp spi 4260196 \ > reqid 20004 mode tunnel aead "rfc4106(gcm(aes))" \ > 0x1111016400000000000000000000000044440001 128 \ > sel src 1011:1:4::2/128 sel dst 1021:1:4::2/128 dev Port5 > > Fixes: 07bf7908950a ("xfrm: Validate address prefix lengths in the xfrm selector.") > Signed-off-by: Anirudh Gupta > --- > net/xfrm/xfrm_user.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c > index eb8d14389601..1d1fe2208ab5 100644 > --- a/net/xfrm/xfrm_user.c > +++ b/net/xfrm/xfrm_user.c > @@ -150,6 +150,23 @@ static int verify_newsa_info(struct xfrm_usersa_info *p, > > err = -EINVAL; > switch (p->family) { > + case AF_INET: > + break; > + > + case AF_INET6: > +#if IS_ENABLED(CONFIG_IPV6) > + break; > +#else > + err = -EAFNOSUPPORT; > + goto out; > +#endif > + > + default: > + goto out; > + } > + > + err = -EINVAL; This is not needed because you already set it at the start. Otherwise this looks good to me. Thanks, -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt