From patchwork Thu Jan 4 11:21:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 855555 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zC52z5Hffz9sQm for ; Thu, 4 Jan 2018 22:21:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752845AbeADLVN (ORCPT ); Thu, 4 Jan 2018 06:21:13 -0500 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 Received: from gondolin.me.apana.org.au ([192.168.0.6] helo=gondolin.hengli.com.au) by norbury.hmeau.com with esmtp (Exim 4.80 #3 (Debian)) id 1eX3a8-0006et-Ai; Thu, 04 Jan 2018 22:21:08 +1100 Received: from herbert by gondolin.hengli.com.au with local (Exim 4.80) (envelope-from ) id 1eX3a4-0001gS-Sz; Thu, 04 Jan 2018 22:21:04 +1100 Date: Thu, 4 Jan 2018 22:21:04 +1100 From: Herbert Xu To: Steffen Klassert , netdev@vger.kernel.org Subject: xfrm: Return error on unknown switch in init_state Message-ID: <20180104112104.GA6437@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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; }