diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2018-11-07 10:19:35 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-13 08:51:31 +0100 |
| commit | 388682b7bdde5d87fd4c316762677c0c103e728c (patch) | |
| tree | 1676bf95e96bf622eb358a13150fa64a78228403 /drivers/net/ethernet/intel | |
| parent | e0cf32be082a6ef5688f6d2d66672898ef3cd993 (diff) | |
| download | linux-rt-388682b7bdde5d87fd4c316762677c0c103e728c.tar.gz | |
ice: Fix possible NULL pointer de-reference
[ Upstream commit f25dad19ba70f7cc135da78ec013325042cd8c52 ]
A recent update to smatch is causing it to report the error "we previously
assumed 'm_entry->vsi_list_info' could be null". Fix that.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/intel')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_switch.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c index 4012adbab011..1bfc59dff51f 100644 --- a/drivers/net/ethernet/intel/ice/ice_switch.c +++ b/drivers/net/ethernet/intel/ice/ice_switch.c @@ -1023,6 +1023,9 @@ ice_handle_vsi_list_mgmt(struct ice_hw *hw, u16 vsi_id = new_fltr->fwd_id.vsi_id; enum ice_adminq_opc opcode; + if (!m_entry->vsi_list_info) + return ICE_ERR_CFG; + /* A rule already exists with the new VSI being added */ if (test_bit(vsi_id, m_entry->vsi_list_info->vsi_map)) return 0; |