From: Jan Kiszka <jan.kiszka@siemens.com> To: 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>, Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>, Jingoo Han <jingoohan1@gmail.com>, Joao Pinto <Joao.Pinto@synopsys.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Subject: [PATCH] PCI: Clean up resource allocation in devm_of_pci_get_host_bridge_resources() Date: Wed, 16 May 2018 14:31:44 +0200 [thread overview] Message-ID: <f35b2972-aa40-5397-facb-765cafe7c315@siemens.com> (raw) In-Reply-To: <CAHp75VeM7_8+9QJjOypXaiBhpWP4B5KACdUQ-p3frbS3jPh=OQ@mail.gmail.com> 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); if (!res) { err = -ENOMEM; goto failed; } - err = of_pci_range_to_resource(&range, dev_node, res); - if (err) { - devm_kfree(dev, res); - continue; - } - if (resource_type(res) == IORESOURCE_IO) { if (!io_base) { dev_err(dev, -- 2.13.6
WARNING: multiple messages have this Message-ID (diff)
From: jan.kiszka@siemens.com (Jan Kiszka) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] PCI: Clean up resource allocation in devm_of_pci_get_host_bridge_resources() Date: Wed, 16 May 2018 14:31:44 +0200 [thread overview] Message-ID: <f35b2972-aa40-5397-facb-765cafe7c315@siemens.com> (raw) In-Reply-To: <CAHp75VeM7_8+9QJjOypXaiBhpWP4B5KACdUQ-p3frbS3jPh=OQ@mail.gmail.com> 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); if (!res) { err = -ENOMEM; goto failed; } - err = of_pci_range_to_resource(&range, dev_node, res); - if (err) { - devm_kfree(dev, res); - continue; - } - if (resource_type(res) == IORESOURCE_IO) { if (!io_base) { dev_err(dev, -- 2.13.6
next prev parent reply other threads:[~2018-05-16 12:35 UTC|newest] Thread overview: 66+ 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:06 ` 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 ` 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 ` 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 9:07 ` Jan Kiszka 2018-05-15 9:07 ` Jan Kiszka 2018-05-15 10:04 ` Vladimir Zapolskiy 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 9:07 ` Jan Kiszka 2018-05-15 9:07 ` Jan Kiszka 2018-05-15 10:05 ` Vladimir Zapolskiy 2018-05-15 10:05 ` Vladimir Zapolskiy 2018-05-15 15:34 ` Jingoo Han 2018-05-15 15:34 ` Jingoo Han 2018-05-15 15:34 ` Jingoo Han 2018-05-28 10:00 ` Vladimir Zapolskiy 2018-05-28 10:00 ` Vladimir Zapolskiy 2018-05-28 10:00 ` Vladimir Zapolskiy 2018-05-28 10:46 ` Jan Kiszka 2018-05-28 10:46 ` Jan Kiszka 2018-05-28 10:46 ` Jan Kiszka 2018-05-29 13:20 ` Bjorn Helgaas 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 9:07 ` Jan Kiszka 2018-05-15 10:05 ` Vladimir Zapolskiy 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 9:07 ` Jan Kiszka 2018-05-15 10:06 ` Vladimir Zapolskiy 2018-05-15 10:06 ` Vladimir Zapolskiy 2018-05-15 14:28 ` Joao Pinto 2018-05-15 14:28 ` Joao Pinto 2018-05-15 14:28 ` Joao Pinto 2018-05-15 15:31 ` Jingoo Han 2018-05-15 15:31 ` Jingoo Han 2018-05-15 15:31 ` Jingoo Han 2018-05-15 16:48 ` Andy Shevchenko 2018-05-15 16:48 ` Andy Shevchenko 2018-05-15 16:48 ` Andy Shevchenko 2018-05-15 16:50 ` Andy Shevchenko 2018-05-15 16:50 ` Andy Shevchenko 2018-05-15 16:50 ` Andy Shevchenko 2018-05-16 12:31 ` Jan Kiszka [this message] 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 2018-05-17 6:23 ` Vladimir Zapolskiy 2018-06-05 16:26 ` Andy Shevchenko 2018-06-05 16:26 ` Andy Shevchenko 2018-06-05 20:44 ` Bjorn Helgaas 2018-06-05 20:44 ` Bjorn Helgaas 2018-06-05 20:44 ` Bjorn Helgaas 2018-06-29 23:30 ` Bjorn Helgaas 2018-06-29 23:30 ` 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 ` Jan Kiszka 2018-05-15 9:07 ` [PATCH v4 8/8] PCI: Enable PCI_DOMAINS along with " Jan Kiszka 2018-05-15 9:07 ` Jan Kiszka 2018-05-15 19:00 ` [PATCH v4 0/8] PCI: leak fixes, removable generic PCI host, assorted stuff Bjorn Helgaas 2018-05-15 19:00 ` Bjorn Helgaas 2018-05-15 19:00 ` 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=f35b2972-aa40-5397-facb-765cafe7c315@siemens.com \ --to=jan.kiszka@siemens.com \ --cc=Joao.Pinto@synopsys.com \ --cc=andy.shevchenko@gmail.com \ --cc=bhelgaas@google.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 \ --cc=vladimir_zapolskiy@mentor.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.