From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1164045-1517178551-2-1575446926609802117 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=1517178550; b=eJxKRJ2fZj8UPhO6U7t6sxyP5jfodHZkhwb3fjNGAeGLz+R ACloKWO6Ssx27Ld/hH4naXfRegMosY2oLJAwB52gDAEv8mSSYOVF+3r5aIMdRi/D v4GY4SD7LyXNCM9TCjQG/5wpzmx/9oCTZYIbvR83/bhW30psRFANKBQfv58nZX/z kNp0KkhaE2prI9Jife8JlaVL0JWVAAsoyoateDWpJMPdG8CBY4eQ6LsGRbXF0WkB Sv5QFnEKGv/B+hgJklPTQ1rCmu+M1+wxoTAtcwgEU+uNpRQ/rI+oUoaAiKPTZ+eS AVxZFZVTBKf/dTh7Wq2+9VTjrrzfwyGJMn6P1RA== 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=1517178550; bh=7Ub4tu V8e4Kk4XIbRQWRdOcdGPV6Ykekq4uASCWWA0c=; b=X88eaCGimIkvIijzIWwnVt O2gn4m5kxXhKfFIWKtVN8ZpnsEGEHViKJU0V6y1rrSeOuvUWTJgeaoky93paMuBk DYgD0eFRjLx5QTvVL8tndCULPDEOf5Sycrsyy8wvoIIxN1zKeV6iRuZmpKxzHuf8 FhUO5PCXsjGdK2j4bCz/c1AbbZJOexFLkyHKT5OrD5yMck9iET1W0SnDn8GlJu0n KQlk5tkzH/D2/3Nt1jX3Nzt3W0AJDUaewQLLDqcu6cCyN6oUZTvMyAP2915QYOQ+ 45Q8u/0UFst2Rxu9iPkx07Alr218BhNxvtxLEhyL9v68gfjPaQF1PBWrL5Jwvxiw == ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=glkzCV5x 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: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=glkzCV5x 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 S1753433AbeA1W3I (ORCPT ); Sun, 28 Jan 2018 17:29:08 -0500 Received: from mail-by2nam03on0118.outbound.protection.outlook.com ([104.47.42.118]:52393 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753443AbeA1W3G (ORCPT ); Sun, 28 Jan 2018 17:29:06 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Steffen Klassert , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 34/49] xfrm: Fix stack-out-of-bounds read on socket policy lookup. Thread-Topic: [PATCH AUTOSEL for 4.9 34/49] xfrm: Fix stack-out-of-bounds read on socket policy lookup. Thread-Index: AQHTmIc/I8KhCpMPtkGGwKHHaGBbAA== Date: Sun, 28 Jan 2018 22:27:58 +0000 Message-ID: <20180128222727.22404-34-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-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;MW2PR2101MB0924;7:y+53/IX27ZRKXDGbxIYIsOKn65gxuglXvoV3TXjSsFZR9+n8pw4uKXv9v8f2V1yhK5DwJ8AwzCHZ6qGhgNrYJPJj6GT5vyCEExkNjUfrtdwtr8wjFK3SCsUkNr/98wRj900N18/7ZHhd4HCokj938TIJZYojKiGYzWzB2Y7EPJyvATlBJtGN9JtVpUfz67imRSG9IClKf5VjIaM5GunJSmLXDm/1GBDQEMA1NPXxgUrDuwHDMl+cpoHaQoMnGnNh x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 428855a7-61be-46ae-af02-08d5669e894e x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB0924; x-ms-traffictypediagnostic: MW2PR2101MB0924: 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)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:MW2PR2101MB0924;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB0924; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(346002)(39860400002)(366004)(39380400002)(376002)(189003)(199004)(2906002)(26005)(10090500001)(6116002)(3846002)(59450400001)(8936002)(6666003)(86362001)(36756003)(186003)(66066001)(99286004)(1076002)(107886003)(86612001)(4326008)(25786009)(5250100002)(68736007)(2900100001)(2501003)(72206003)(6512007)(3280700002)(22452003)(53936002)(478600001)(10290500003)(106356001)(3660700001)(110136005)(54906003)(97736004)(6436002)(316002)(2950100002)(8676002)(81156014)(76176011)(81166006)(6506007)(105586002)(305945005)(14454004)(6486002)(102836004)(5660300001)(7736002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB0924;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: Ee8oE92y0vfAlmzZiGYyGs2nuWXoFydlO0fK/jq/Sebj0rnJq00STYTR0C3bmOPm3RaTjb+C5192MXKH2rU4gg== 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: 428855a7-61be-46ae-af02-08d5669e894e X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:58.0388 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB0924 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 f19e6a57e118..cfe13a4385c1 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -1256,9 +1256,15 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(con= st struct sock *sk, int dir, again: 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