| Message ID | 1537425631-28460-1-git-send-email-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCI: hv: Fix return value check in hv_pci_assign_slots() | expand |
[+DaveM, netdev] On Thu, Sep 20, 2018 at 06:40:31AM +0000, Wei Yongjun wrote: > In case of error, the function pci_create_slot() returns ERR_PTR() and > never returns NULL. The NULL test in the return value check should be > replaced with IS_ERR(). > > Fixes: a15f2c08c708 ("PCI: hv: support reporting serial number as slot information") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/pci/controller/pci-hyperv.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c > index ee80e79..9ba4d12 100644 > --- a/drivers/pci/controller/pci-hyperv.c > +++ b/drivers/pci/controller/pci-hyperv.c > @@ -1484,8 +1484,10 @@ static void hv_pci_assign_slots(struct hv_pcibus_device *hbus) > snprintf(name, SLOT_NAME_SIZE, "%u", hpdev->desc.ser); > hpdev->pci_slot = pci_create_slot(hbus->pci_bus, slot_nr, > name, NULL); > - if (!hpdev->pci_slot) > + if (IS_ERR(hpdev->pci_slot)) { > pr_warn("pci_create slot %s failed\n", name); > + hpdev->pci_slot = NULL; > + } > } > } > FYI I am dropping this patch from the PCI queue since the original series is now queued in net-next. Lorenzo IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
[+DaveM, netdev] Removed erroneously added disclaimer, apologies. On Thu, Sep 20, 2018 at 06:40:31AM +0000, Wei Yongjun wrote: > In case of error, the function pci_create_slot() returns ERR_PTR() and > never returns NULL. The NULL test in the return value check should be > replaced with IS_ERR(). > > Fixes: a15f2c08c708 ("PCI: hv: support reporting serial number as slot information") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/pci/controller/pci-hyperv.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c > index ee80e79..9ba4d12 100644 > --- a/drivers/pci/controller/pci-hyperv.c > +++ b/drivers/pci/controller/pci-hyperv.c > @@ -1484,8 +1484,10 @@ static void hv_pci_assign_slots(struct hv_pcibus_device *hbus) > snprintf(name, SLOT_NAME_SIZE, "%u", hpdev->desc.ser); > hpdev->pci_slot = pci_create_slot(hbus->pci_bus, slot_nr, > name, NULL); > - if (!hpdev->pci_slot) > + if (IS_ERR(hpdev->pci_slot)) { > pr_warn("pci_create slot %s failed\n", name); > + hpdev->pci_slot = NULL; > + } > } > } I am dropping this patch from the PCI queue since the original series is now queued in net-next. Lorenzo
diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index ee80e79..9ba4d12 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -1484,8 +1484,10 @@ static void hv_pci_assign_slots(struct hv_pcibus_device *hbus) snprintf(name, SLOT_NAME_SIZE, "%u", hpdev->desc.ser); hpdev->pci_slot = pci_create_slot(hbus->pci_bus, slot_nr, name, NULL); - if (!hpdev->pci_slot) + if (IS_ERR(hpdev->pci_slot)) { pr_warn("pci_create slot %s failed\n", name); + hpdev->pci_slot = NULL; + } } }
In case of error, the function pci_create_slot() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: a15f2c08c708 ("PCI: hv: support reporting serial number as slot information") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/pci/controller/pci-hyperv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)