| From e4315dd574208beb060276b468b8d051aaad9e9b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 7 Nov 2018 10:19:35 -0800 |
| Subject: ice: Fix possible NULL pointer de-reference |
| |
| From: Bruce Allan <bruce.w.allan@intel.com> |
| |
| [ 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> |
| --- |
| drivers/net/ethernet/intel/ice/ice_switch.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c |
| index 4012adbab0112..1bfc59dff51f7 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; |
| -- |
| 2.20.1 |
| |
