| From f3ec5dca304911c7a3c78fb9589d1d7503025580 Mon Sep 17 00:00:00 2001 |
| From: Jesse Brandeburg <jesse.brandeburg@intel.com> |
| Date: Fri, 8 Nov 2019 06:23:21 -0800 |
| Subject: [PATCH] ice: fix stack leakage |
| |
| commit 949375de945f7042df2b6488228a1a2b36e69f35 upstream. |
| |
| 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: 1071a8358a28 ("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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c |
| index 1826e5562ce5..f4e9c6ba568f 100644 |
| --- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c |
| +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c |
| @@ -1662,8 +1662,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)) { |
| @@ -1682,7 +1682,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; |
| -- |
| 2.7.4 |
| |
