Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3525052pxf; Mon, 15 Mar 2021 11:29:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzd7Da5Clf9n1n5Fw/SboYyF61m3izfdGuIRdEnqpdYRoDdM82zKAA7FvY3dnEmAUP1yGUt X-Received: by 2002:a50:ee10:: with SMTP id g16mr31041579eds.215.1615832972211; Mon, 15 Mar 2021 11:29:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615832972; cv=none; d=google.com; s=arc-20160816; b=HNmuOFXWhL0rPdLquBwKEnjkXqVSSv5LsemNqiYb1gY55x3ln4a5AQ4uPxXxgxW8lx j/G0+3CmCvIiKp7mO9D65WBncw5ApdFJVCVtnlxT0LetT9lCE0qgHjFvCpzia1vfRZdD +PSZQdiAxK3qUmMBxYZxC12+HftYN294zp+m8UUkYHqQWY90Y7PR+x6FMRUJV9uFSi7Z bNxKEQ2vCFA5Z0fILz4uljpvE/yQ+V8d+yXNyMkJfWaCvHQDmYdONfGkM/9fcJYDYe2s 5KlwjMYWuktHP12f7p2oY0BafnrjNLc0SmrxO82cwgB2SAOJKPn0SWH+b0XDMUJNWY8q DHng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=I64kMoYJXEa+/s+rQHq3b4zLwKv/9zpJI8UTlbldND8=; b=qx4tBndGYh33ctw2AECgsXuBEXiN1Y1kuQ5lIORrF36Mlf2mMMLUIVeA7SemjVI1oj 9SYCnxvpOgKeIyo+h1PPhw7CfK+e+KaYBw5l8+fIQgKY5w9iLgSgSI3lAGnTZweaoYeb spynYKZA6PjPqpaen3fbXjEbMBqLEmwQBGbZJkILT548iLGgm89uLOjNNm8EueQ7xbgI 0x+mTxwztk7jD2Q6kHDWuJOJQ7fHZyk3skbTZk6wuwe5Pfk5M4CFh2OkkDnUR4HCjKsJ 5Amr7yZADpLlP6Z5t8/S6YiJqyavRu93sPblxWyPcZGhlgQt+MuoO+za9sZfhoDDmS8D /tOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="b7hO/Iu1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n28si2695765edc.564.2021.03.15.11.29.04; Mon, 15 Mar 2021 11:29:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="b7hO/Iu1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231483AbhCOOdp (ORCPT + 99 others); Mon, 15 Mar 2021 10:33:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:38284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233291AbhCOOBW (ORCPT ); Mon, 15 Mar 2021 10:01:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8971664F72; Mon, 15 Mar 2021 14:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816860; bh=/9QUm6B0bxaRCai/1jNkDp7YJ8yxEcZJAFEOjb+YINk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b7hO/Iu1JE6youX2+g+1OCNEbxKY90NOW570ZsXcJOXEiaWI+LnMBxX3OOJG7ZnFi WWC6AJh/01tNlPT97/ZlQf+EvBCtTIEoUf3o72sQFt0jPXOJF47txydJyScFpWYxls nkEm/KxrJGtdSaj91ke75AO0McePZIQwSaWA3zRI= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , Bjorn Helgaas , Sasha Levin Subject: [PATCH 5.10 157/290] PCI: Fix pci_register_io_range() memory leak Date: Mon, 15 Mar 2021 14:54:10 +0100 Message-Id: <20210315135547.219813957@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135541.921894249@linuxfoundation.org> References: <20210315135541.921894249@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Geert Uytterhoeven [ Upstream commit f6bda644fa3a7070621c3bf12cd657f69a42f170 ] Kmemleak reports: unreferenced object 0xc328de40 (size 64): comm "kworker/1:1", pid 21, jiffies 4294938212 (age 1484.670s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 e0 d8 fc eb 00 00 00 00 ................ 00 00 10 fe 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [] pci_register_io_range+0x3c/0x80 [<2c7f139e>] of_pci_range_to_resource+0x48/0xc0 [] devm_of_pci_get_host_bridge_resources.constprop.0+0x2ac/0x3ac [] devm_of_pci_bridge_init+0x60/0x1b8 [] devm_pci_alloc_host_bridge+0x54/0x64 [] rcar_pcie_probe+0x2c/0x644 In case a PCI host driver's probe is deferred, the same I/O range may be allocated again, and be ignored, causing a memory leak. Fix this by (a) letting logic_pio_register_range() return -EEXIST if the passed range already exists, so pci_register_io_range() will free it, and by (b) making pci_register_io_range() not consider -EEXIST an error condition. Link: https://lore.kernel.org/r/20210202100332.829047-1-geert+renesas@glider.be Signed-off-by: Geert Uytterhoeven Signed-off-by: Bjorn Helgaas Signed-off-by: Sasha Levin --- drivers/pci/pci.c | 4 ++++ lib/logic_pio.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 5c9345072510..9e971fffeb6a 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4010,6 +4010,10 @@ int pci_register_io_range(struct fwnode_handle *fwnode, phys_addr_t addr, ret = logic_pio_register_range(range); if (ret) kfree(range); + + /* Ignore duplicates due to deferred probing */ + if (ret == -EEXIST) + ret = 0; #endif return ret; diff --git a/lib/logic_pio.c b/lib/logic_pio.c index f32fe481b492..07b4b9a1f54b 100644 --- a/lib/logic_pio.c +++ b/lib/logic_pio.c @@ -28,6 +28,8 @@ static DEFINE_MUTEX(io_range_mutex); * @new_range: pointer to the IO range to be registered. * * Returns 0 on success, the error code in case of failure. + * If the range already exists, -EEXIST will be returned, which should be + * considered a success. * * Register a new IO range node in the IO range list. */ @@ -51,6 +53,7 @@ int logic_pio_register_range(struct logic_pio_hwaddr *new_range) list_for_each_entry(range, &io_range_list, list) { if (range->fwnode == new_range->fwnode) { /* range already there */ + ret = -EEXIST; goto end_register; } if (range->flags == LOGIC_PIO_CPU_MMIO && -- 2.30.1