From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372482-1517180542-2-1633834160946325457 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES ensvro, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517180542; b=eYlJifhtzlnJyX4LtIsZJJw0sLBI8KYUgX/wzLiRuRtcDyC NFK8H6pi6KGnyUh+7ZM1vK7IkGoITCf6XpFBROn6pOIkvlXfzAaaTxVS8YfJMGCR yHCLJ2WcvCzSqOIPW+vP7U/WyjGUilq0xCZi+q2FlH2wRTdVvDzjX+7Zo2pdMSAL SBvMPHKThtvlD9s6GtddwZ/t409UiPCt8h16bOTh8uPOBdf5MsEbHCqlnRFKc4hX r9hsdjpk5jkgyC9Gh0S3+sc5/X+BN3Plfz4uElzMW7w//Omqzjklg05ckTEa388P fFsXqTv0gl5PQdeguWd6YGStwpwlLaAoCK7AcfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517180542; bh=qqReWm ES/D8qnUucRI8sEPVFyXY9d4FzGRweiNlnpwI=; b=btRiV+MGsSe6fgqEzmcaU5 wFzfWC6mahBmJ5V6UB3VhSo9HRB9ruISKtRhhmiHqLsoXjzAPZFv+7Lq+1GVF1dT EXSK05u3sH/VRHS18JHdgnspA5sdtLmCofNDXNK8QVhy/E9PHs2msHaTtdIQq7zr EqHOqClfM9m1NHZ5yqYMp3imeLITjh6QEbHoixskE3b1CWa+dR4/OBQuBn4y3EjR 8WWa85cvpOOYd4cENRAl8TGbzRcoWnC//4ooKgW3K63ZZ6i1HKpq07cQCEwyVRC3 s8pDke1vS9vWNsSBbjhqWzm/mgFKjKqMj1qFze5qBYh7cYkQqD+1OHwmhi+8oluA == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=TUOMdknw x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=TUOMdknw x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753590AbeA1XCE (ORCPT ); Sun, 28 Jan 2018 18:02:04 -0500 Received: from mail-bn3nam01on0113.outbound.protection.outlook.com ([104.47.33.113]:60480 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753479AbeA1W1q (ORCPT ); Sun, 28 Jan 2018 17:27:46 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Aviv Heller , Yevgeny Kliteynik , Steffen Klassert , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 076/100] xfrm: Fix xfrm_input() to verify state is valid when (encap_type < 0) Thread-Topic: [PATCH AUTOSEL for 4.14 076/100] xfrm: Fix xfrm_input() to verify state is valid when (encap_type < 0) Thread-Index: AQHTmIcWPtNXSmkW6UycSf26ayzyQA== Date: Sun, 28 Jan 2018 22:26:48 +0000 Message-ID: <20180128222547.7398-76-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1018;7:6i2jn35yPq2vnhz+1ZcfqTxM6WG0b/MPDbJSdtUNbdHwo3miQ+q9J/iCIqWrM4l7Lc4rTequf7AwGzBhNF0N/G8oBp7aj3dmk21FO1/tIZ3LglrePfr84ZRGj+rraf8Of/YVS8mWsBYFWmTnNSZGNyYUyTVP+SnR4bAssWN+E8sKarIWZqfYMsFOMcCDF6Bhv1sdM1wJ1mWf4HRUqwkDykYejqjKrMlDPgBsy7USbW9UUcw9HL2YAx/+Ux9AiCyD x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 171288a8-83c6-4e3d-4641-08d5669e56c4 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1018; x-ms-traffictypediagnostic: MW2PR2101MB1018: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011);SRVR:MW2PR2101MB1018;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1018; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39380400002)(39860400002)(366004)(346002)(376002)(199004)(189003)(53936002)(2501003)(6436002)(86362001)(6486002)(5250100002)(26005)(102836004)(6512007)(59450400001)(76176011)(6116002)(2900100001)(3846002)(36756003)(305945005)(7736002)(316002)(3660700001)(22452003)(3280700002)(15650500001)(54906003)(110136005)(99286004)(186003)(97736004)(1076002)(86612001)(81166006)(6666003)(2906002)(106356001)(14454004)(66066001)(4326008)(68736007)(5660300001)(25786009)(8936002)(10290500003)(81156014)(72206003)(107886003)(10090500001)(478600001)(2950100002)(105586002)(8676002)(6506007)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1018;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: otnBENU6Vecr9XYAimMcLFCycFiYhBgZ6RkmLjkrOHBLtmaV7IiHHt1QwCcFL3A4hYa3Upy/OTBiQK6Qinp3EQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 171288a8-83c6-4e3d-4641-08d5669e56c4 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:48.6544 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1018 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 =3D=3D 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 --- net/xfrm/xfrm_input.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index 347ab31574d5..da6447389ffb 100644 --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c @@ -207,7 +207,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32= spi, int encap_type) xfrm_address_t *daddr; struct xfrm_mode *inner_mode; u32 mark =3D skb->mark; - unsigned int family; + unsigned int family =3D AF_UNSPEC; int decaps =3D 0; int async =3D 0; bool xfrm_gro =3D false; @@ -216,6 +216,16 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be3= 2 spi, int encap_type) =20 if (encap_type < 0) { x =3D xfrm_input_state(skb); + + if (unlikely(x->km.state !=3D XFRM_STATE_VALID)) { + if (x->km.state =3D=3D XFRM_STATE_ACQ) + XFRM_INC_STATS(net, LINUX_MIB_XFRMACQUIREERROR); + else + XFRM_INC_STATS(net, + LINUX_MIB_XFRMINSTATEINVALID); + goto drop; + } + family =3D x->outer_mode->afinfo->family; =20 /* An encap_type of -1 indicates async resumption. */ --=20 2.11.0