From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1175177-1517178611-2-17421459400180230487 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=1517178609; b=Qd3IlKb2HiAZjPWhVlRjp0AWU6hqdJgDlShXEUPi7X+Ak30 ogN4QFJGR4ew1CsEVI+MjXxvXgZc27j2S/so+daBCwTkfvSYXlzSfxLGdhFYhs6o b535WFLNf2c63LKvIxqOaDQ9e0glfvvoEvgJZjUP27M5mfAlYnOqotfToYkoFgLy w0YCeTk3hq1AYyI/dmVyKWDzBXobXFL2ASFsHmIZwbjxqvMT0nEYDoYM3cZnvyuz +VOKAJjtCeC7OIbwOPU5Rdstkn5e9yYe3JOnV+qanV6IrnSh+GcnrNFbiWZN6U+6 AHOf6awgrJKy3y4DI3RKc2yiqI8y0ZVuzRCV9fg== 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=1517178609; bh=u/rafN PQeebkpMwMYJOgZl9HfcInXtbfHokSV5AQKo0=; b=nUBlvXPmIREgd+dTnsepzs FCPsZ6y5rUWNQCgwSTQshZkwkYH0PUiCh2gxFo3bABGY8qUJY1ui+JMnOiO5TJNR 9zkceVwAALn+ZP8TfIuo4Sd+QN5TblZMHPntHliUmP2QTPUTFUgjvbfJPAk+6CRF Bq9hvFJi7qVGnAdeC6Ct5pwZikyEQ8TlUKhOjaY5HWGw+hkStHpuWY8aoDEGUIiU y4EXdnFk0gwP1j4L4vBdv4Ed9uXL53iSMShR7vWXFYwmcNO+ETKS6DBphhfyjjh8 qSfek6ivJZ6JX5uA4HAf2u3unSOFuLvcB/BuiKW9j7SmdBHcL9irEJDLEDKaBj+g == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=YBPyTrvJ 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: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=YBPyTrvJ 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 S932512AbeA1WaG (ORCPT ); Sun, 28 Jan 2018 17:30:06 -0500 Received: from mail-cys01nam02on0124.outbound.protection.outlook.com ([104.47.37.124]:11968 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753813AbeA1W34 (ORCPT ); Sun, 28 Jan 2018 17:29:56 -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 24/36] xfrm: Fix stack-out-of-bounds read on socket policy lookup. Thread-Topic: [PATCH AUTOSEL for 4.4 24/36] xfrm: Fix stack-out-of-bounds read on socket policy lookup. Thread-Index: AQHTmIdYx9PmKBdsy0CFF5cG6tOPJA== Date: Sun, 28 Jan 2018 22:28:40 +0000 Message-ID: <20180128222815.29479-24-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:kBT1OXOstkdN10V3UGrk+c2f5EhXvFNbpf7GWX8yyw65d+xZ9RB3cLZqa2vMNMER1er7u4SRTAGcTU4GThz6sAIl+CRuOnv3AifyLnTF1umSmMyIPprJuqFiypsDFshjNGd/B8XcteHCGu7on7zr/TF55RH5O99CMlCRjWu1RZxXw8CfqwB7DOjyW+Ai3JH7ISGJIYfKVrgZETc/wPMJ1n62Fn6EOkGLHDV8SGvmijerlqSmWlY0EjvM545ly2yx x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b873e764-39eb-47f0-dcd9-08d5669ea5dc 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)(215639381216008)(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: dux76e1d0KwT0EIKHt+FMDfheyJ1BaMRFP09JaEej85IpzpDYb8n3VZ6M+rZilxbsfTln38O2PiRczhAenYsDw== 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: b873e764-39eb-47f0-dcd9-08d5669ea5dc X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:28:40.2697 (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 ddc47e4404b58f03e98345398fb12d38fe291512 ] When we do tunnel or beet mode, we pass saddr and daddr from the template to xfrm_state_find(), this is ok. On transport mode, we pass the addresses from the flowi, assuming that the IP addresses (and address family) don't change during transformation. This assumption is wrong in the IPv4 mapped IPv6 case, packet is IPv4 and template is IPv6. Fix this by catching address family missmatches of the policy and the flow already before we do the lookup. Reported-by: syzbot Signed-off-by: Steffen Klassert Signed-off-by: Sasha Levin --- net/xfrm/xfrm_policy.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 22df3b51e905..4b09a9eaa35f 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -1225,9 +1225,15 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(con= st struct sock *sk, int dir, read_lock_bh(&net->xfrm.xfrm_policy_lock); pol =3D rcu_dereference(sk->sk_policy[dir]); if (pol !=3D NULL) { - bool match =3D xfrm_selector_match(&pol->selector, fl, family); + bool match; int err =3D 0; =20 + if (pol->family !=3D family) { + pol =3D NULL; + goto out; + } + + match =3D xfrm_selector_match(&pol->selector, fl, family); if (match) { if ((sk->sk_mark & pol->mark.m) !=3D pol->mark.v) { pol =3D NULL; --=20 2.11.0