From mboxrd@z Thu Jan 1 00:00:00 1970 From: Herbert Xu Subject: xfrm: Return error on unknown switch in init_state Date: Thu, 4 Jan 2018 22:21:04 +1100 Message-ID: <20180104112104.GA6437@gondor.apana.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: Steffen Klassert , netdev@vger.kernel.org Return-path: Received: from [128.1.224.119] ([128.1.224.119]:49852 "EHLO ringil.hmeau.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752758AbeADLVM (ORCPT ); Thu, 4 Jan 2018 06:21:12 -0500 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: Currently esp will happily create an xfrm state with an unknown encap type for IPv4 or an unknown mode for IPv6, without setting the necessary state parameters. This patch fixes it by returning -EINVAL. 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..f2130ff 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -896,6 +896,7 @@ static int esp6_init_state(struct xfrm_state *x) x->props.header_len += sizeof(struct ipv6hdr); break; default: + err = -EINVAL; goto error; } -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt