diff options
| author |   Alexander Duyck <aduyck@mirantis.com> | 2015-11-02 17:09:29 -0800 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-12-12 00:44:18 -0800 |
| commit | 530fd82a9fea5bba8e044bdf6fdf2ddc495e3807 (patch) | |
| tree | 609976af73b62c4601792ddc1be5527646e3f6d6 /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |
| parent | Merge branch 'mlx5-flow-steering' (diff) | |
| download | linux-dev-530fd82a9fea5bba8e044bdf6fdf2ddc495e3807.tar.xz linux-dev-530fd82a9fea5bba8e044bdf6fdf2ddc495e3807.zip | |
ixgbe: Return error on failure to allocate mac_table
Add a check to make certain mac_table was actually allocated and is not
NULL. If it is NULL return -ENOMEM and allow the probe routine to fail
rather then causing a NULL pointer dereference further down the line.
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index ebd4522e7879..c539b1c71201 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -5381,6 +5381,8 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter) adapter->mac_table = kzalloc(sizeof(struct ixgbe_mac_addr) * hw->mac.num_rar_entries, GFP_ATOMIC); + if (!adapter->mac_table) + return -ENOMEM; /* Set MAC specific capability flags and exceptions */ switch (hw->mac.type) { |