Skip to content

Commit

Permalink
net/ice: fix illegal access when removing MAC filter
Browse files Browse the repository at this point in the history
[ upstream commit f4b6eb2 ]

When removing the mac filter in ice_remove_all_mac_vlan_filters(),
TAILQ_FOREACH_SAFE should be used instead of TAILQ_FOREACH,
Otherwise, it will result in a illegal pointer access.

Fixes: e0dcf94 ("net/ice: support VLAN ops")

Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
Tested-by: Zhihong Peng <zhihongx.peng@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
  • Loading branch information
wenwumax authored and steevenlee committed May 8, 2021
1 parent ac002ac commit 1cb30b3
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/net/ice/ice_ethdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#include <sys/stat.h>
#include <unistd.h>

#include <rte_tailq.h>

#include "base/ice_sched.h"
#include "base/ice_flow.h"
#include "base/ice_dcb.h"
Expand Down Expand Up @@ -1088,12 +1090,13 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi)
{
struct ice_mac_filter *m_f;
struct ice_vlan_filter *v_f;
void *temp;
int ret = 0;

if (!vsi || !vsi->mac_num)
return -EINVAL;

TAILQ_FOREACH(m_f, &vsi->mac_list, next) {
TAILQ_FOREACH_SAFE(m_f, &vsi->mac_list, next, temp) {
ret = ice_remove_mac_filter(vsi, &m_f->mac_info.mac_addr);
if (ret != ICE_SUCCESS) {
ret = -EINVAL;
Expand All @@ -1104,7 +1107,7 @@ ice_remove_all_mac_vlan_filters(struct ice_vsi *vsi)
if (vsi->vlan_num == 0)
return 0;

TAILQ_FOREACH(v_f, &vsi->vlan_list, next) {
TAILQ_FOREACH_SAFE(v_f, &vsi->vlan_list, next, temp) {
ret = ice_remove_vlan_filter(vsi, v_f->vlan_info.vlan_id);
if (ret != ICE_SUCCESS) {
ret = -EINVAL;
Expand Down

0 comments on commit 1cb30b3

Please sign in to comment.