net: dsa: Fix use after free in dsa_switch_remove()
Subsystems (3)
PATCH 1/1 net: dsa: Fix use after free in dsa_switch_remove()
The order in which the ports are deleted from the list and freed and the call to dsa_tree_remove_switch() is done is reversed, which leads to an use after free condition. Reverse the two: first tear down the ports and switch from the fabric, then free the ports associated with that switch fabric.
--- net/dsa/dsa2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/dsa/dsa2.c +2 -1
@@ -874,12 +874,13 @@ static void dsa_switch_remove(struct dsa_switch *ds)struct dsa_switch_tree *dst = ds->dst;struct dsa_port *dp, *next; +dsa_tree_teardown (dst); +list_for_each_entry_safe (dp, next, &dst->ports, list) {list_del (&dp->list);kfree (dp); } -dsa_tree_teardown (dst);dsa_tree_put (dst); }
Signature · 1 line
2.17.1
Quoted 2 lines · Florian Fainelli
The order in which the ports are deleted from the list and freed and the call to
dsa_tree_remove_switch()is done is reversed, which leads to an
s/dsa_tree_remove_switch/dsa_switch_remove/
Quoted 6 lines
use after free condition. Reverse the two: first tear down the ports and switch from the fabric, then free the ports associated with that switch fabric.
Fixes 05f294a85235 ("net: dsa: allocate ports on touch")Signed-off-by Florian Fainelli <[email protected]>
Thanks for reporting and fixing this!
From: Florian Fainelli <[email protected]>
Date: Sat, 2 Nov 2019 20:13:26 -0700
Quoted 8 lines
The order in which the ports are deleted from the list and freed and the call to
dsa_tree_remove_switch()is done is reversed, which leads to an use after free condition. Reverse the two: first tear down the ports and switch from the fabric, then free the ports associated with that switch fabric.Fixes 05f294a85235 ("net: dsa: allocate ports on touch")Signed-off-by Florian Fainelli <[email protected]>
Applied.