mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
To: Jan Kiszka <jan.kiszka@siemens.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
	<linux-pci@vger.kernel.org>,
	linux-arm Mailing List <linux-arm-kernel@lists.infradead.org>,
	Jingoo Han <jingoohan1@gmail.com>,
	Joao Pinto <Joao.Pinto@synopsys.com>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Subject: Re: [PATCH] PCI: Clean up resource allocation in devm_of_pci_get_host_bridge_resources()
Date: Thu, 17 May 2018 09:23:07 +0300	[thread overview]
Message-ID: <97f42f4a-071a-4335-ca65-a0f26adc1b89@mentor.com> (raw)
In-Reply-To: <f35b2972-aa40-5397-facb-765cafe7c315@siemens.com>

On 05/16/2018 03:31 PM, Jan Kiszka wrote:
> Instead of first allocating and then freeing memory for struct resource
> in case we cannot parse a PCI resource from the device tree, work
> against a local struct and kmemdup it when we decide to go with it.
> 
> Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  drivers/pci/of.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/pci/of.c b/drivers/pci/of.c
> index b06585a1da75..fc0f906c5c25 100644
> --- a/drivers/pci/of.c
> +++ b/drivers/pci/of.c
> @@ -266,7 +266,7 @@ int devm_of_pci_get_host_bridge_resources(struct device *dev,
>  			struct list_head *resources, resource_size_t *io_base)
>  {
>  	struct device_node *dev_node = dev->of_node;
> -	struct resource *res;
> +	struct resource *res, tmp_res;
>  	struct resource *bus_range;
>  	struct of_pci_range range;
>  	struct of_pci_range_parser parser;
> @@ -320,18 +320,16 @@ int devm_of_pci_get_host_bridge_resources(struct device *dev,
>  		if (range.cpu_addr == OF_BAD_ADDR || range.size == 0)
>  			continue;
>  
> -		res = devm_kzalloc(dev, sizeof(struct resource), GFP_KERNEL);
> +		err = of_pci_range_to_resource(&range, dev_node, &tmp_res);
> +		if (err)
> +			continue;
> +
> +		res = devm_kmemdup(dev, &tmp_res, sizeof(tmp_res), GFP_KERNEL);

The change looks okay, apparently probable garbage in tmp_res.desc has no impact.

Reviewed-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>

--
With best wishes,
Vladimir

  reply	other threads:[~2018-05-17  6:23 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-15  9:06 [PATCH v4 0/8] PCI: leak fixes, removable generic PCI host, assorted stuff Jan Kiszka
2018-05-15  9:07 ` [PATCH v4 1/8] PCI: Make pci_get_new_domain_nr() static Jan Kiszka
2018-05-15  9:07 ` [PATCH v4 2/8] PCI: Fix memory leak of devm_pci_alloc_host_bridge() Jan Kiszka
2018-05-15  9:07 ` [PATCH v4 3/8] PCI: Rename device node parameter of of_pci_get_host_bridge_resources() Jan Kiszka
2018-05-15 10:04   ` Vladimir Zapolskiy
2018-05-15  9:07 ` [PATCH v4 4/8] PCI: Replace dev_node parameter of of_pci_get_host_bridge_resources with device Jan Kiszka
2018-05-15 10:05   ` Vladimir Zapolskiy
2018-05-15 15:34   ` Jingoo Han
2018-05-28 10:00   ` Vladimir Zapolskiy
2018-05-28 10:46     ` Jan Kiszka
2018-05-29 13:20       ` Bjorn Helgaas
2018-05-15  9:07 ` [PATCH v4 5/8] PCI: Replace pr_*() with dev_*() in of_pci_get_host_bridge_resources() Jan Kiszka
2018-05-15 10:05   ` Vladimir Zapolskiy
2018-05-15  9:07 ` [PATCH v4 6/8] PCI: Rework of_pci_get_host_bridge_resources() to devm_of_pci_get_host_bridge_resources() Jan Kiszka
2018-05-15 10:06   ` Vladimir Zapolskiy
2018-05-15 14:28   ` Joao Pinto
2018-05-15 15:31   ` Jingoo Han
2018-05-15 16:48   ` Andy Shevchenko
2018-05-15 16:50     ` Andy Shevchenko
2018-05-16 12:31       ` [PATCH] PCI: Clean up resource allocation in devm_of_pci_get_host_bridge_resources() Jan Kiszka
2018-05-17  6:23         ` Vladimir Zapolskiy [this message]
2018-06-05 16:26         ` Andy Shevchenko
2018-06-05 20:44           ` Bjorn Helgaas
2018-06-29 23:30         ` Bjorn Helgaas
2018-05-15  9:07 ` [PATCH v4 7/8] PCI: Add support for unbinding the generic PCI host controller Jan Kiszka
2018-05-15  9:07 ` [PATCH v4 8/8] PCI: Enable PCI_DOMAINS along with " Jan Kiszka
2018-05-15 19:00 ` [PATCH v4 0/8] PCI: leak fixes, removable generic PCI host, assorted stuff Bjorn Helgaas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=97f42f4a-071a-4335-ca65-a0f26adc1b89@mentor.com \
    --to=vladimir_zapolskiy@mentor.com \
    --cc=Joao.Pinto@synopsys.com \
    --cc=andy.shevchenko@gmail.com \
    --cc=bhelgaas@google.com \
    --cc=jan.kiszka@siemens.com \
    --cc=jingoohan1@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®