Received: by 10.223.185.116 with SMTP id b49csp1065121wrg; Fri, 23 Feb 2018 11:16:41 -0800 (PST) X-Google-Smtp-Source: AH8x226Cy+WGYeqiHv52hMWqvKWxIXErqusfvph7lOB9wiGJmmWfpwdWzqOlWNzCGgstCUZ9wSRg X-Received: by 10.99.116.69 with SMTP id e5mr2238764pgn.437.1519413400918; Fri, 23 Feb 2018 11:16:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519413400; cv=none; d=google.com; s=arc-20160816; b=xvC4dH0Up/wWeJFYDMY9XJITult+YEaYAFcIIq4NkDyyKVFxs58pSFf3q/AUNhXDJo 69c69zCv9S3y0r+8ISR1THd1kiDkzM9BiHy1y2TeKTbjZRE2qE75CFizL2A0U1Xpe4su Lmn8AIRcSk+X/0mk6PrkwsWCpz6gwfMwIFPI8mHiTqQqiTBQe7QBjeu4hR5woG9GV6Mx 0wdes+/NyjICHuHRYy0BoI7y7lsxtHJ5R3sIb+3wrqjrAYYaZ3FcqyiTufmImMTS2BoK OoNrQ6QPBfSNmfS04bpTCZmFABUtTCXad/YD5tb6NKn0SSOTzq8ZNm1RYr2Iz8E5RLgx imkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=oHceiN7rB29N2wNG1d4+uAMO/oCzeQFn1qOfgyI4vwU=; b=mu3ff8o0x5llpE0LDBRXwgfAA1L6viNf8a15G0nRNxhMIsYkbHloyrNAXJtgwiNSMQ mk5fF1ftfb9sk5tm2xKweTO+rQqCQbBqEv3Fh3AEEP/kE6gEt0CdPFdfpeeM/e+lLOOq 5HWg6t6ssCs7MYRfU5Q2KL3CNYGaulpXbm2kr14vIxf3dDt+y/Tc3aSJZ69V9y3CAc4E Sowk9Kx2QiI5enaJW0RC4o6a9yTV/LmBUdvJg3D3S1T/XlvsDajexxtiU0Kz/f8xKE3d OKrAXBrb+UBTsNPgRmv3GgZ6WKR1UnFAy/YDfAp9oq0iSsNtC3YQQWCQrYP5YhbngpvX g6ZQ== 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 w15si2246499pfa.86.2018.02.23.11.16.26; Fri, 23 Feb 2018 11:16:40 -0800 (PST) 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 S1754057AbeBWTPw (ORCPT + 99 others); Fri, 23 Feb 2018 14:15:52 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:48188 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965144AbeBWSzY (ORCPT ); Fri, 23 Feb 2018 13:55:24 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 42C261275; Fri, 23 Feb 2018 18:55:23 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aviv Heller , Yevgeny Kliteynik , Steffen Klassert , Sasha Levin Subject: [PATCH 4.14 133/159] xfrm: Fix xfrm_input() to verify state is valid when (encap_type < 0) Date: Fri, 23 Feb 2018 19:27:21 +0100 Message-Id: <20180223170759.188697997@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Aviv Heller [ Upstream commit 4ce3dbe397d7b6b15f272ae757c78c35e9e4b61d ] Code path when (encap_type < 0) does not verify the state is valid before progressing. This will result in a crash if, for instance, x->km.state == XFRM_STATE_ACQ. Fixes: 7785bba299a8 ("esp: Add a software GRO codepath") Signed-off-by: Aviv Heller Signed-off-by: Yevgeny Kliteynik Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/xfrm/xfrm_input.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c @@ -207,7 +207,7 @@ int xfrm_input(struct sk_buff *skb, int xfrm_address_t *daddr; struct xfrm_mode *inner_mode; u32 mark = skb->mark; - unsigned int family; + unsigned int family = AF_UNSPEC; int decaps = 0; int async = 0; bool xfrm_gro = false; @@ -216,6 +216,16 @@ int xfrm_input(struct sk_buff *skb, int if (encap_type < 0) { x = xfrm_input_state(skb); + + if (unlikely(x->km.state != XFRM_STATE_VALID)) { + if (x->km.state == XFRM_STATE_ACQ) + XFRM_INC_STATS(net, LINUX_MIB_XFRMACQUIREERROR); + else + XFRM_INC_STATS(net, + LINUX_MIB_XFRMINSTATEINVALID); + goto drop; + } + family = x->outer_mode->afinfo->family; /* An encap_type of -1 indicates async resumption. */