ice: fix stack leakage (949375de) · Commits · 戴 / test

In the case of an invalid virtchannel request the driver would return uninitialized data to the VF from the PF stack which is a bug. Fix by initializing the stack variable earlier in the function before any return paths can be taken. Fixes: ("ice: Implement virtchnl commands for AVF support") Signed-off-by:

Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by:

Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by:

Jeff Kirsher <jeffrey.t.kirsher@intel.com>

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -1886,8 +1886,8 @@ static int ice_vc_get_stats_msg(struct ice_vf vf, u8 msg)
		enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;
		struct virtchnl_queue_select *vqs =
		(struct virtchnl_queue_select *)msg;
		struct ice_eth_stats stats = { 0 };
		struct ice_pf *pf = vf->pf;
		struct ice_eth_stats stats;
		struct ice_vsi *vsi;

		if (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states)) {
		@@ -1906,7 +1906,6 @@ static int ice_vc_get_stats_msg(struct ice_vf vf, u8 msg)
		goto error_param;
		}

		memset(&stats, 0, sizeof(struct ice_eth_stats));
		ice_update_eth_stats(vsi);

		stats = vsi->eth_stats;

Admin message