From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517180138-2-2249459245091089989 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=1517180137; b=kPj2rGEpH43pq2r0x/G/uhdY/kTHdhYNLK2sBc7MHqn+72w Y6ZUHhy6v8JlkdHNBBzEEVRwU9LnkY3lsH/Xrw3WDBJAwcs24wFg776V8xmMa3Ff byaE+a8yLuAtx0m6/99slpWHh4D5bB1oK5hmFQV22BcZfORnkSMX9nvh33Z8cIGa cbQJYGhHRiGjENfscKjmI4pZsJtMAmx0ErYdx4Q3Uo5w92JtYsAauDOVW44gVjMA Apm+ciJoN4maSSOXT/GV0RcKkqCq9rMCDVFsKiJaRdu0qCh7suIN4/adM1cr8ImL vW1mC2cGZAGK/OzN23qus+6vWt5ieveXbTa62AQ== 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=1517180137; bh=2zgP0w qEl9Ue2eAXQn6FvIJZLkqwEcRbU3jIPwy/LIg=; b=RSXLjLUiSWQj1xPHMiYgpo NQiElpLhJpMFLhlrBLG8GifitJ9CG8gMoPRS16t5NBUoDaHcj/Ika8KJ3lJwLBEo AKmByc6T+zT6CKa7aIouxiiYKiSHRG7DjcN2f7ESmOiGJCBY1gFfdbP+/psKOHFX 0gPs53kO9Us3qQtZUpjM1BFA7sBsRfE3NIUXWn7Pxs9Fln5q+K4hmdurDHAYZYuJ eXDu3CS9U2XwZYtCCTEKNXg6EdAiZwABEOdhvtReG0QHDfzQ89XO8cCdCuZFgWwz enpy88fHQjeo+k2+ysRb38Qg1+lPmZ5CZgEfhQMd/HQwV+F1jX90X2xJUQfkPKqA == 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=oQMpausY 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=oQMpausY 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 S932134AbeA1W23 (ORCPT ); Sun, 28 Jan 2018 17:28:29 -0500 Received: from mail-sn1nam02on0134.outbound.protection.outlook.com ([104.47.36.134]:55568 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932075AbeA1W2Z (ORCPT ); Sun, 28 Jan 2018 17:28:25 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Geert Uytterhoeven , Bjorn Helgaas , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 098/100] PCI: rcar: Fix use-after-free in probe error path Thread-Topic: [PATCH AUTOSEL for 4.14 098/100] PCI: rcar: Fix use-after-free in probe error path Thread-Index: AQHTmIcfO4jHoyd96UCapSXP5WXYtA== Date: Sun, 28 Jan 2018 22:27:04 +0000 Message-ID: <20180128222547.7398-98-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;MW2PR2101MB1017;7:u42pDLpsfrJiQ4WXmFCEY/FssNQ/g41yz/TmX4lndpINMNoUhPyPHOBvt6GzqvBHvAMRrNxkGo1sif7VhZB9AYr59JQaf2gBT8g5T0CdSnsQSSlIzfvWrWL+bP9Vq06AHhBl/6B/r9kD0IbQMEfxJkcfleq73nXEWmLX6+qCs00lFy3Py3h4IKa7ydBTFa/kfvq8fQXjYvjHxwrt7qLmDLlc73Yu3y/QTkysHdvZuwbtXppjlMA6udZkWR7ytKYz x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 696f2762-7077-453b-a2cd-08d5669e6ed6 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1017; x-ms-traffictypediagnostic: MW2PR2101MB1017: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(180628864354917)(89211679590171)(211936372134217)(153496737603132); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231101)(944501161)(3002001)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:MW2PR2101MB1017;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1017; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39860400002)(39380400002)(366004)(346002)(376002)(189003)(199004)(59450400001)(81156014)(6666003)(305945005)(2900100001)(76176011)(68736007)(86612001)(3660700001)(8676002)(3280700002)(6506007)(102836004)(6116002)(105586002)(7736002)(2950100002)(3846002)(1076002)(106356001)(36756003)(5660300001)(2906002)(8936002)(66066001)(10090500001)(6486002)(6512007)(25786009)(53936002)(186003)(316002)(6436002)(86362001)(575784001)(14454004)(478600001)(2501003)(5250100002)(72206003)(99286004)(97736004)(107886003)(4326008)(54906003)(81166006)(110136005)(26005)(10290500003)(22452003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1017;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: 5T92pCQPT/j5cQUVpxp8YU890mSLlkZX85POIipezTevFAolHHjNri1oVyPSoEFy2/Lyki1jPo/PbUXnFbSp+Q== 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: 696f2762-7077-453b-a2cd-08d5669e6ed6 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:04.5688 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1017 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: Geert Uytterhoeven [ Upstream commit 0c31f1d7be1b5c4858b1d714dcefa25f41428cab ] If CONFIG_DEBUG_SLAB=3Dy, and no PCIe card is inserted, the kernel crashes during probe on r8a7791/koelsch: rcar-pcie fe000000.pcie: PCIe link down Unable to handle kernel paging request at virtual address 6b6b6b6b (seeing this message requires earlycon and keep_bootcon). Indeed, pci_free_host_bridge() frees the PCI host bridge, including the embedded rcar_pcie object, so pci_free_resource_list() must not be called afterwards. To fix this, move the call to pci_free_resource_list() up, and update the label name accordingly. Fixes: ddd535f1ea3eb27e ("PCI: rcar: Fix memory leak when no PCIe card is i= nserted") Signed-off-by: Geert Uytterhoeven Signed-off-by: Bjorn Helgaas Acked-by: Simon Horman Acked-by: Lorenzo Pieralisi Signed-off-by: Sasha Levin --- drivers/pci/host/pcie-rcar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 4e0b25d09b0c..f09ff4789bb5 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -1146,12 +1146,12 @@ static int rcar_pcie_probe(struct platform_device *= pdev) err =3D rcar_pcie_get_resources(pcie); if (err < 0) { dev_err(dev, "failed to request resources: %d\n", err); - goto err_free_bridge; + goto err_free_resource_list; } =20 err =3D rcar_pcie_parse_map_dma_ranges(pcie, dev->of_node); if (err) - goto err_free_bridge; + goto err_free_resource_list; =20 pm_runtime_enable(dev); err =3D pm_runtime_get_sync(dev); @@ -1194,9 +1194,9 @@ static int rcar_pcie_probe(struct platform_device *pd= ev) err_pm_disable: pm_runtime_disable(dev); =20 -err_free_bridge: - pci_free_host_bridge(bridge); +err_free_resource_list: pci_free_resource_list(&pcie->resources); + pci_free_host_bridge(bridge); =20 return err; } --=20 2.11.0