From: "Saheed O. Bolarinwa" <refactormyself@gmail.com>
To: skhan@linuxfoundation.org, linux-acpi@vger.kernel.org,
linux-pci@vger.kernel.org,
linux-kernel-mentees@lists.linuxfoundation.org,
linux-kernel@vger.kernel.org
Cc: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>
Subject: [Linux-kernel-mentees] [PATCH 8/14 v3] PCI/ACPI: Check the return value of pcie_capability_read_*()
Date: Mon, 13 Jul 2020 19:55:28 +0200 [thread overview]
Message-ID: <20200713175529.29715-4-refactormyself@gmail.com> (raw)
In-Reply-To: <20200713175529.29715-1-refactormyself@gmail.com>
From: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>
On failure pcie_capability_read_dword() sets it's last parameter,
val to 0.
However, with Patch 14/14, it is possible that val is set to ~0 on
failure. This would introduce a bug because (x & x) == (~0 & x).
This bug can be avoided if the return value of pcie_capability_read_word
is checked to confirm success.
Check the return value of pcie_capability_read_word() to ensure success.
Suggested-by: Bjorn Helgaas <bjorn@helgaas.com>
Signed-off-by: Bolarinwa Olayemi Saheed <refactormyself@gmail.com>
---
drivers/pci/pci-acpi.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 7224b1e5f2a8..39eb816bc3b8 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -248,12 +248,13 @@ static bool pcie_root_rcb_set(struct pci_dev *dev)
{
struct pci_dev *rp = pcie_find_root_port(dev);
u16 lnkctl;
+ int ret;
if (!rp)
return false;
- pcie_capability_read_word(rp, PCI_EXP_LNKCTL, &lnkctl);
- if (lnkctl & PCI_EXP_LNKCTL_RCB)
+ ret = pcie_capability_read_word(rp, PCI_EXP_LNKCTL, &lnkctl);
+ if (!ret && (lnkctl & PCI_EXP_LNKCTL_RCB))
return true;
return false;
@@ -792,12 +793,13 @@ bool pciehp_is_native(struct pci_dev *bridge)
{
const struct pci_host_bridge *host;
u32 slot_cap;
+ int ret;
if (!IS_ENABLED(CONFIG_HOTPLUG_PCI_PCIE))
return false;
- pcie_capability_read_dword(bridge, PCI_EXP_SLTCAP, &slot_cap);
- if (!(slot_cap & PCI_EXP_SLTCAP_HPC))
+ ret = pcie_capability_read_dword(bridge, PCI_EXP_SLTCAP, &slot_cap);
+ if (ret || !(slot_cap & PCI_EXP_SLTCAP_HPC))
return false;
if (pcie_ports_native)
--
2.18.2
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
next prev parent reply other threads:[~2020-07-13 16:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-13 17:55 [Linux-kernel-mentees] [PATCH 1/14 v3] IB/hfi1: Check the return value of pcie_capability_read_*() Saheed O. Bolarinwa
2020-07-13 17:09 ` Jason Gunthorpe
2020-07-13 17:55 ` [Linux-kernel-mentees] [PATCH 3/14 v3] ath9k: " Saheed O. Bolarinwa
2020-07-20 17:09 ` Kalle Valo
2020-07-13 17:55 ` [Linux-kernel-mentees] [PATCH 4/14 v3] iwlegacy: " Saheed O. Bolarinwa
2020-07-15 16:47 ` Kalle Valo
2020-07-13 17:55 ` Saheed O. Bolarinwa [this message]
2020-07-14 13:27 ` [Linux-kernel-mentees] [PATCH 8/14 v3] PCI/ACPI: " Rafael J. Wysocki
2020-07-13 17:55 ` [Linux-kernel-mentees] [PATCH 12/14 v3] PCI/AER: " Saheed O. Bolarinwa
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=20200713175529.29715-4-refactormyself@gmail.com \
--to=refactormyself@gmail.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=skhan@linuxfoundation.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).