summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvalis <sec@valis.email>2023-07-29 08:32:02 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-11 11:53:56 +0200
commit1c8262f31fd2d23d1cfd2539715d976c2a99e582 (patch)
tree1c7a9b42204dc59c1c0f3debe220ee43c477bdd7
parent83e3d4b0ae373dcba30c68bf28f8d179191a297a (diff)
downloadlinux-stable-1c8262f31fd2d23d1cfd2539715d976c2a99e582.tar.gz
linux-stable-1c8262f31fd2d23d1cfd2539715d976c2a99e582.tar.bz2
linux-stable-1c8262f31fd2d23d1cfd2539715d976c2a99e582.zip
net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
[ Upstream commit b80b829e9e2c1b3f7aae34855e04d8f6ecaf13c8 ] When route4_change() is called on an existing filter, the whole tcf_result struct is always copied into the new instance of the filter. This causes a problem when updating a filter bound to a class, as tcf_unbind_filter() is always called on the old instance in the success path, decreasing filter_cnt of the still referenced class and allowing it to be deleted, leading to a use-after-free. Fix this by no longer copying the tcf_result struct from the old filter. Fixes: 1109c00547fc ("net: sched: RCU cls_route") Reported-by: valis <sec@valis.email> Reported-by: Bing-Jhong Billy Jheng <billy@starlabs.sg> Signed-off-by: valis <sec@valis.email> Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> Reviewed-by: Victor Nogueira <victor@mojatatu.com> Reviewed-by: Pedro Tammela <pctammela@mojatatu.com> Reviewed-by: M A Ramdhan <ramdhan@starlabs.sg> Link: https://lore.kernel.org/r/20230729123202.72406-4-jhs@mojatatu.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--net/sched/cls_route.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index b775e681cb56..1ad4b3e60eb3 100644
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -511,7 +511,6 @@ static int route4_change(struct net *net, struct sk_buff *in_skb,
if (fold) {
f->id = fold->id;
f->iif = fold->iif;
- f->res = fold->res;
f->handle = fold->handle;
f->tp = fold->tp;