Skip to content

Commit 703ba88

Browse files
Colin Ian KingJeff Kirsher
authored andcommitted
i40evf: dereference VSI after VSI has been null checked
VSI is being dereferenced before the VSI null check; if VSI is null we end up with a null pointer dereference. Fix this by performing VSI deference after the VSI null check. Also remove the need for using adapter by using vsi->back->cinst. Detected by CoverityScan, CID#1419696, CID#1419697 ("Dereference before null check") Fixes: ed0e894 ("i40evf: add client interface") Signed-off-by: Colin Ian King <[email protected]> Tested-by: Andrew Bowers <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent c76cb6e commit 703ba88

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/net/ethernet/intel/i40evf/i40evf_client.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ static struct i40e_ops i40evf_lan_ops = {
3434
**/
3535
void i40evf_notify_client_message(struct i40e_vsi *vsi, u8 *msg, u16 len)
3636
{
37-
struct i40evf_adapter *adapter = vsi->back;
38-
struct i40e_client_instance *cinst = adapter->cinst;
37+
struct i40e_client_instance *cinst;
3938

4039
if (!vsi)
4140
return;
4241

42+
cinst = vsi->back->cinst;
4343
if (!cinst || !cinst->client || !cinst->client->ops ||
4444
!cinst->client->ops->virtchnl_receive) {
4545
dev_dbg(&vsi->back->pdev->dev,
@@ -58,12 +58,13 @@ void i40evf_notify_client_message(struct i40e_vsi *vsi, u8 *msg, u16 len)
5858
**/
5959
void i40evf_notify_client_l2_params(struct i40e_vsi *vsi)
6060
{
61-
struct i40evf_adapter *adapter = vsi->back;
62-
struct i40e_client_instance *cinst = adapter->cinst;
61+
struct i40e_client_instance *cinst;
6362
struct i40e_params params;
6463

6564
if (!vsi)
6665
return;
66+
67+
cinst = vsi->back->cinst;
6768
memset(&params, 0, sizeof(params));
6869
params.mtu = vsi->netdev->mtu;
6970
params.link_up = vsi->back->link_up;

0 commit comments

Comments
 (0)