From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517179240-2-5628280785745182873 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 en, 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=1517179239; b=uY+xNjVrcfpmlWtYfMan6pqDg/DhDAjveL/scRWS4BSynPD XX6M5Jp08fG00yngIDag88Ni/ejOXajcYDbmpdUY71VMmcKpXj4wEZO15Dqw0mMZ 9KcOPZUQP5AoUOAuYGMqEOECDur7T7abm3AdDg0EvI8dskpfKTh1AR2yY2SGN7y8 ap2Cw7JSbAninG5MZLCh6ZxI3Jky9fv8L08BZjIkv7pIg/ZQqQoNErjLwvH9kMW6 cuG/HJfojeyDojbyQV8nXFASNFC9y9BxwEWG9cETs043kRbG5hYPfz0PCtSCZ4sW 20taDMPX5iM9BMR9j/TCQYHJh9VvVY9V8Al7vNQ== 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=1517179239; bh=oo4hMD hHqAuoKarLQ7zSkkuKSzx59J/NweBrzV/IqWs=; b=UTplwzZSEtOBC84Azhe21+ M7oaBUUSthuu29N5dYMFoRJ3jSstGRV09CJAP8c7/10CJlpvoeinq2WmtW8PkGEw GSWLrmJ+KnjtGWJc25hZaEci1COU0NwfwuYyzon5J02wNSNpVyPULGtsQ4bhjdu0 qPMLG9fjnqDvLLH6J+2Ra2075VoElMofy+H1IXiNR3BpejrdpbMoMwS5zy7E7/CX Nx8aKpRfNKfaxxGWnl9gFYW2wWkAhGpaDPDdj0RPd+YK4J4OoHn/AZ2tgzXQLVx8 WTm02XoC/F5dKB65xnpwNl507ETLd+GnB9GhW3TqDFZrQNt+fdwodA13JbJL9lQw == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=cCanNrWy 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: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=cCanNrWy 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 S932554AbeA1WkF (ORCPT ); Sun, 28 Jan 2018 17:40:05 -0500 Received: from mail-by2nam03on0094.outbound.protection.outlook.com ([104.47.42.94]:9952 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753791AbeA1W36 (ORCPT ); Sun, 28 Jan 2018 17:29:58 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Steffen Klassert , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 30/36] xfrm: Fix stack-out-of-bounds with misconfigured transport mode policies. Thread-Topic: [PATCH AUTOSEL for 4.4 30/36] xfrm: Fix stack-out-of-bounds with misconfigured transport mode policies. Thread-Index: AQHTmIdbqxwEPLE/b0iTWsVVBZjvxQ== Date: Sun, 28 Jan 2018 22:28:45 +0000 Message-ID: <20180128222815.29479-30-alexander.levin@microsoft.com> References: <20180128222815.29479-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222815.29479-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;MW2PR2101MB1114;7:S5z5jWOA+F7HtlQxIulx+/tAVkuO+LVvNUxz0MlkgX/2wpyk1iHzbkbl0KV3/ZuEpFw1DfG1Walq5ku3t26LfZz8vmWnc7UhymibF9htv5ZweQc21MIew1vb7Q5K60v1wlWIqp06/XOzEQ4szGarnOt0HdK5NlSqVGFfJhX7p4jHdOQfRdIG0yFe2PL3W/viVqukEmQt/XiMMBnbC/TorKjxclTR5vAUBr6qniDaZQqDR+bgCKcrUE/J2AirtpX1 x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 3bb26ec3-1e42-494c-6109-08d5669ea778 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1114; x-ms-traffictypediagnostic: MW2PR2101MB1114: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(278428928389397)(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:MW2PR2101MB1114;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1114; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(39380400002)(39860400002)(346002)(366004)(189003)(199004)(305945005)(186003)(110136005)(26005)(81156014)(7736002)(8936002)(6506007)(102836004)(81166006)(6116002)(3846002)(316002)(1076002)(6486002)(6436002)(105586002)(22452003)(72206003)(3660700001)(2950100002)(14454004)(107886003)(6666003)(59450400001)(10290500003)(99286004)(68736007)(2906002)(97736004)(478600001)(3280700002)(76176011)(8676002)(54906003)(86612001)(10090500001)(36756003)(86362001)(2900100001)(5660300001)(25786009)(4326008)(5250100002)(6512007)(53936002)(106356001)(2501003)(66066001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1114;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: GZ573NKqRtcWrTKS2jLeDEy+C0wDNrlGlRv8LDeRxedFStqSDTDhIa7H366UYh3lrL4oTO3nlkiZitjtveJVXQ== 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: 3bb26ec3-1e42-494c-6109-08d5669ea778 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:28:45.2943 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1114 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: Steffen Klassert [ Upstream commit 732706afe1cc46ef48493b3d2b69c98f36314ae4 ] On policies with a transport mode template, we pass the addresses from the flowi to xfrm_state_find(), assuming that the IP addresses (and address family) don't change during transformation. Unfortunately our policy template validation is not strict enough. It is possible to configure policies with transport mode template where the address family of the template does not match the selectors address family. This lead to stack-out-of-bound reads because we compare arddesses of the wrong family. Fix this by refusing such a configuration, address family can not change on transport mode. We use the assumption that, on transport mode, the first templates address family must match the address family of the policy selector. Subsequent transport mode templates must mach the address family of the previous template. Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin --- net/xfrm/xfrm_user.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 76944a4839a5..a3bf423313fb 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -1376,11 +1376,14 @@ static void copy_templates(struct xfrm_policy *xp, = struct xfrm_user_tmpl *ut, =20 static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family) { + u16 prev_family; int i; =20 if (nr > XFRM_MAX_DEPTH) return -EINVAL; =20 + prev_family =3D family; + for (i =3D 0; i < nr; i++) { /* We never validated the ut->family value, so many * applications simply leave it at zero. The check was @@ -1392,6 +1395,12 @@ static int validate_tmpl(int nr, struct xfrm_user_tm= pl *ut, u16 family) if (!ut[i].family) ut[i].family =3D family; =20 + if ((ut[i].mode =3D=3D XFRM_MODE_TRANSPORT) && + (ut[i].family !=3D prev_family)) + return -EINVAL; + + prev_family =3D ut[i].family; + switch (ut[i].family) { case AF_INET: break; --=20 2.11.0