2017-04-23 12:08:13

by Pan Bian

Subject: [PATCH 1/1] qlcnic: fix unchecked return value

From: Pan Bian <[email protected]>

Function pci_find_ext_capability() may return 0, which is an invalid
address. In function qlcnic_sriov_virtid_fn(), its return value is used
without validation. This may result in invalid memory access bugs. This
patch fixes the bug.

Signed-off-by: Pan Bian <[email protected]>
---
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
index d710705..2f656f3 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
@@ -128,6 +128,8 @@ static int qlcnic_sriov_virtid_fn(struct qlcnic_adapter *adapter, int vf_id)
return 0;

pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_SRIOV);
+ if (!pos)
+ return 0;
pci_read_config_word(dev, pos + PCI_SRIOV_VF_OFFSET, &offset);
pci_read_config_word(dev, pos + PCI_SRIOV_VF_STRIDE, &stride);

--
1.9.1

2017-04-24 20:11:27

by David Miller

Subject: Re: [PATCH 1/1] qlcnic: fix unchecked return value

aFrom: Pan Bian <[email protected]>
Date: Sun, 23 Apr 2017 20:04:04 +0800

> From: Pan Bian <[email protected]>
>
> Function pci_find_ext_capability() may return 0, which is an invalid
> address. In function qlcnic_sriov_virtid_fn(), its return value is used
> without validation. This may result in invalid memory access bugs. This
> patch fixes the bug.
>
> Signed-off-by: Pan Bian <[email protected]>

Applied.