From mboxrd@z Thu Jan 1 00:00:00 1970 From: Herbert Xu Subject: [PATCH v2] xfrm: Return error on unknown encap_type in init_state Date: Fri, 5 Jan 2018 22:12:32 +1100 Message-ID: <20180105111232.GA15350@gondor.apana.org.au> References: <20180104112104.GA6437@gondor.apana.org.au> <20180105083247.ce7hu2lmy64fyff5@gauss3.secunet.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org To: Steffen Klassert Return-path: Received: from [128.1.224.119] ([128.1.224.119]:49946 "EHLO ringil.hmeau.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750756AbeAELMl (ORCPT ); Fri, 5 Jan 2018 06:12:41 -0500 Content-Disposition: inline In-Reply-To: <20180105083247.ce7hu2lmy64fyff5@gauss3.secunet.de> Sender: netdev-owner@vger.kernel.org List-ID: On Fri, Jan 05, 2018 at 09:32:47AM +0100, Steffen Klassert wrote: > > Looks like we catch the unknown mode in __xfrm_init_state(). > But in any case, if we want to return -EINVAL on unknown mode, > we should do it for IPv6 and for IPv4. OK, how about this one then: ---8<--- Currently esp will happily create an xfrm state with an unknown encap type for IPv4, without setting the necessary state parameters. This patch fixes it by returning -EINVAL. There is a similar problem in IPv6 where if the mode is unknown we will skip initialisation while returning zero. However, this is harmless as the mode has already been checked further up the stack. This patch removes this anomaly by aligning the IPv6 behaviour with IPv4 and treating unknown modes (which cannot actually happen) as transport mode. Fixes: 38320c70d282 ("[IPSEC]: Use crypto_aead and authenc in ESP") Signed-off-by: Herbert Xu diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index d57aa64..61fe6e4 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -981,6 +981,7 @@ static int esp_init_state(struct xfrm_state *x) switch (encap->encap_type) { default: + err = -EINVAL; goto error; case UDP_ENCAP_ESPINUDP: x->props.header_len += sizeof(struct udphdr); diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index a902ff8..1a7f00c 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -890,13 +890,12 @@ static int esp6_init_state(struct xfrm_state *x) x->props.header_len += IPV4_BEET_PHMAXLEN + (sizeof(struct ipv6hdr) - sizeof(struct iphdr)); break; + default: case XFRM_MODE_TRANSPORT: break; case XFRM_MODE_TUNNEL: x->props.header_len += sizeof(struct ipv6hdr); break; - default: - goto error; } align = ALIGN(crypto_aead_blocksize(aead), 4); -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt