Skip to content

Commit a333605

Browse files
jjagielskkuba-moo
authored andcommitted
ice: Fix memory management in ice_ethtool_fdir.c
Fix ethtool FDIR logic to not use memory after its release. In the ice_ethtool_fdir.c file there are 2 spots where code can refer to pointers which may be missing. In the ice_cfg_fdir_xtrct_seq() function seg may be freed but even then may be still used by memcpy(&tun_seg[1], seg, sizeof(*seg)). In the ice_add_fdir_ethtool() function struct ice_fdir_fltr *input may first fail to be added via ice_fdir_update_list_entry() but then may be deleted by ice_fdir_update_list_entry. Terminate in both cases when the returned value of the previous operation is other than 0, free memory and don't use it anymore. Reported-by: Michal Schmidt <mschmidt@redhat.com> Link: https://bugzilla.redhat.com/show_bug.cgi?id=2208423 Fixes: cac2a27 ("ice: Support IPv4 Flow Director filters") Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com> Reviewed-by: Leon Romanovsky <leonro@nvidia.com> Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Link: https://lore.kernel.org/r/20230721155854.1292805-1-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent d11b0df commit a333605

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,16 +1281,21 @@ ice_cfg_fdir_xtrct_seq(struct ice_pf *pf, struct ethtool_rx_flow_spec *fsp,
12811281
ICE_FLOW_FLD_OFF_INVAL);
12821282
}
12831283

1284-
/* add filter for outer headers */
12851284
fltr_idx = ice_ethtool_flow_to_fltr(fsp->flow_type & ~FLOW_EXT);
1285+
1286+
assign_bit(fltr_idx, hw->fdir_perfect_fltr, perfect_filter);
1287+
1288+
/* add filter for outer headers */
12861289
ret = ice_fdir_set_hw_fltr_rule(pf, seg, fltr_idx,
12871290
ICE_FD_HW_SEG_NON_TUN);
1288-
if (ret == -EEXIST)
1289-
/* Rule already exists, free memory and continue */
1290-
devm_kfree(dev, seg);
1291-
else if (ret)
1291+
if (ret == -EEXIST) {
1292+
/* Rule already exists, free memory and count as success */
1293+
ret = 0;
1294+
goto err_exit;
1295+
} else if (ret) {
12921296
/* could not write filter, free memory */
12931297
goto err_exit;
1298+
}
12941299

12951300
/* make tunneled filter HW entries if possible */
12961301
memcpy(&tun_seg[1], seg, sizeof(*seg));
@@ -1305,18 +1310,13 @@ ice_cfg_fdir_xtrct_seq(struct ice_pf *pf, struct ethtool_rx_flow_spec *fsp,
13051310
devm_kfree(dev, tun_seg);
13061311
}
13071312

1308-
if (perfect_filter)
1309-
set_bit(fltr_idx, hw->fdir_perfect_fltr);
1310-
else
1311-
clear_bit(fltr_idx, hw->fdir_perfect_fltr);
1312-
13131313
return ret;
13141314

13151315
err_exit:
13161316
devm_kfree(dev, tun_seg);
13171317
devm_kfree(dev, seg);
13181318

1319-
return -EOPNOTSUPP;
1319+
return ret;
13201320
}
13211321

13221322
/**
@@ -1914,7 +1914,9 @@ int ice_add_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd)
19141914
input->comp_report = ICE_FXD_FLTR_QW0_COMP_REPORT_SW_FAIL;
19151915

19161916
/* input struct is added to the HW filter list */
1917-
ice_fdir_update_list_entry(pf, input, fsp->location);
1917+
ret = ice_fdir_update_list_entry(pf, input, fsp->location);
1918+
if (ret)
1919+
goto release_lock;
19181920

19191921
ret = ice_fdir_write_all_fltr(pf, input, true);
19201922
if (ret)

0 commit comments

Comments
 (0)