diff mbox

[net] bnx2x: avoid null pointer dereference when enabling SR-IOV

Message ID 1386151494-28876-1-git-send-email-michals@broadcom.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Michal Kalderon Dec. 4, 2013, 10:04 a.m. UTC 
Fixed NULL pointer dereference when dynamically activating SR-IOV after vf
database failed to be allocated in probe stage (for example due to no ARI
support in pci hub).

Signed-off-by: Michal Kalderon <michals@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

David Miller Dec. 6, 2013, 1:57 a.m. UTC | #1 
From: Michal Kalderon <michals@broadcom.com>
Date: Wed, 4 Dec 2013 12:04:54 +0200

> Fixed NULL pointer dereference when dynamically activating SR-IOV after vf
> database failed to be allocated in probe stage (for example due to no ARI
> support in pci hub).
> 
> Signed-off-by: Michal Kalderon <michals@broadcom.com>
> Signed-off-by: Ariel Elior <ariele@broadcom.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index 0216d59..2e46c28 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -3114,6 +3114,11 @@  int bnx2x_sriov_configure(struct pci_dev *dev, int num_vfs_param)
 {
 	struct bnx2x *bp = netdev_priv(pci_get_drvdata(dev));
 
+	if (!IS_SRIOV(bp)) {
+		BNX2X_ERR("failed to configure SR-IOV since vfdb was not allocated. Check dmesg for errors in probe stage\n");
+		return -EINVAL;
+	}
+
 	DP(BNX2X_MSG_IOV, "bnx2x_sriov_configure called with %d, BNX2X_NR_VIRTFN(bp) was %d\n",
 	   num_vfs_param, BNX2X_NR_VIRTFN(bp));