From: mark gross <mgross@linux.intel.com>
To: Pan Bian <bianpan2016@163.com>
Cc: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>,
Hans de Goede <hdegoede@redhat.com>,
Mark Gross <mgross@linux.intel.com>,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] platform/x86: amd-pmc: put device on error paths
Date: Thu, 21 Jan 2021 16:04:22 -0800 [thread overview]
Message-ID: <20210122000422.GC60912@linux.intel.com> (raw)
In-Reply-To: <20210121045005.73342-1-bianpan2016@163.com>
On Wed, Jan 20, 2021 at 08:50:05PM -0800, Pan Bian wrote:
> Put the PCI device rdev on error paths to fix potential reference count
> leaks.
Can you make a stronger statment than "fix potenital reference count leaks?".
Also, make the commit comment match the code better.
maybe something like:
"On the prob error return paths associated with rdev we are leaking ref counts, add
pci_dev_put to return patch to avoid the leaks".
Note: I'm not sure there is a leak but, assuming the code is correct the commit
comment should be more clear and match the code.
Do you have a test case that show this change is good?
--mark
>
> Signed-off-by: Pan Bian <bianpan2016@163.com>
> ---
> drivers/platform/x86/amd-pmc.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
> index 0102bf1c7916..df140019c4bd 100644
> --- a/drivers/platform/x86/amd-pmc.c
> +++ b/drivers/platform/x86/amd-pmc.c
> @@ -210,31 +210,39 @@ static int amd_pmc_probe(struct platform_device *pdev)
> dev->dev = &pdev->dev;
>
> rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
> - if (!rdev || !pci_match_id(pmc_pci_ids, rdev))
> + if (!rdev || !pci_match_id(pmc_pci_ids, rdev)) {
> + pci_dev_put(rdev);
> return -ENODEV;
> + }
>
> dev->cpu_id = rdev->device;
> err = pci_write_config_dword(rdev, AMD_PMC_SMU_INDEX_ADDRESS, AMD_PMC_BASE_ADDR_LO);
> if (err) {
> dev_err(dev->dev, "error writing to 0x%x\n", AMD_PMC_SMU_INDEX_ADDRESS);
> + pci_dev_put(rdev);
> return pcibios_err_to_errno(err);
> }
>
> err = pci_read_config_dword(rdev, AMD_PMC_SMU_INDEX_DATA, &val);
> - if (err)
> + if (err) {
> + pci_dev_put(rdev);
> return pcibios_err_to_errno(err);
> + }
>
> base_addr_lo = val & AMD_PMC_BASE_ADDR_HI_MASK;
>
> err = pci_write_config_dword(rdev, AMD_PMC_SMU_INDEX_ADDRESS, AMD_PMC_BASE_ADDR_HI);
> if (err) {
> dev_err(dev->dev, "error writing to 0x%x\n", AMD_PMC_SMU_INDEX_ADDRESS);
> + pci_dev_put(rdev);
> return pcibios_err_to_errno(err);
> }
>
> err = pci_read_config_dword(rdev, AMD_PMC_SMU_INDEX_DATA, &val);
> - if (err)
> + if (err) {
> + pci_dev_put(rdev);
> return pcibios_err_to_errno(err);
> + }
>
> base_addr_hi = val & AMD_PMC_BASE_ADDR_LO_MASK;
> pci_dev_put(rdev);
> --
> 2.17.1
>
>
next parent reply other threads:[~2021-01-22 0:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210121045005.73342-1-bianpan2016@163.com>
2021-01-22 0:04 ` mark gross [this message]
2021-02-02 18:33 ` [PATCH] platform/x86: amd-pmc: put device on error paths Hans de Goede
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=20210122000422.GC60912@linux.intel.com \
--to=mgross@linux.intel.com \
--cc=Shyam-sundar.S-k@amd.com \
--cc=bianpan2016@163.com \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).