lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i40e: Fix filter input checks to prevent config with invalid values

Browse Source 
[ Upstream commit 3e48041d9820c17e0a51599d12e66c6e12a8d08d ]

Prevent VF from configuring filters with unsupported actions or use
REDIRECT action with invalid tc number. Current checks could cause
out of bounds access on PF side.

Fixes: e284fc2804 ("i40e: Add and delete cloud filter")
Reviewed-by: Andrii Staikov <andrii.staikov@intel.com>
Signed-off-by: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com>
Signed-off-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Bharathi Sreenivas <bharathi.sreenivas@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sudheer Mogilappagari 2023-11-29 11:23:11 +01:00 committed by Greg Kroah-Hartman
parent 65c6ef02ff
commit ef4fd7518c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
View File

@ -3332,16 +3332,16 @@ static int i40e_validate_cloud_filter(struct i40e_vf *vf,
bool found = false; bool found = false;
int bkt; int bkt;
if (!tc_filter->action) { if (tc_filter->action != VIRTCHNL_ACTION_TC_REDIRECT) {
dev_info(&pf->pdev->dev, dev_info(&pf->pdev->dev,
"VF %d: Currently ADq doesn't support Drop Action\n", "VF %d: ADQ doesn't support this action (%d)\n",
vf->vf_id); vf->vf_id, tc_filter->action);
goto err; goto err;
} }
/* action_meta is TC number here to which the filter is applied */ /* action_meta is TC number here to which the filter is applied */
if (!tc_filter->action_meta || if (!tc_filter->action_meta ||
tc_filter->action_meta > I40E_MAX_VF_VSI) { tc_filter->action_meta > vf->num_tc) {
dev_info(&pf->pdev->dev, "VF %d: Invalid TC number %u\n", dev_info(&pf->pdev->dev, "VF %d: Invalid TC number %u\n",
vf->vf_id, tc_filter->action_meta); vf->vf_id, tc_filter->action_meta);
goto err; goto err;