summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorVladimir Oltean <vladimir.oltean@nxp.com>2022-05-27 02:42:28 +0300
committerXiaobo Xie <xiaobo.xie@nxp.com>2022-06-02 11:19:24 +0200
commit8e63f21e488d750ca932c3afa87081a12563e898 (patch)
treed5580d82ffa1b8715e343a4231b33a1f05edc21e /drivers
parent29d688b225942c5560ea8975259055bf145391b0 (diff)
Revert "net: mscc: ocelot: avoid use after free with deleted tc-trap rules"
This reverts commit 8146e2b6a6436372b886e7c6a3f2589c48d381da. It was fixed differently upstream, we'll use that. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/mscc/ocelot_vcap.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot_vcap.c b/drivers/net/ethernet/mscc/ocelot_vcap.c
index 2ec527c1dd87..2a1c706a4ca4 100644
--- a/drivers/net/ethernet/mscc/ocelot_vcap.c
+++ b/drivers/net/ethernet/mscc/ocelot_vcap.c
@@ -1233,8 +1233,6 @@ static void ocelot_vcap_block_remove_filter(struct ocelot *ocelot,
if (ocelot_vcap_filter_equal(filter, tmp)) {
ocelot_vcap_filter_del_aux_resources(ocelot, tmp);
list_del(&tmp->list);
- if (!list_empty(&tmp->trap_list))
- list_del(&tmp->trap_list);
kfree(tmp);
}
}