]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
net/sched: act_mirred: don't override retval if we already lost the skb
authorJakub Kicinski <kuba@kernel.org>
Thu, 15 Feb 2024 14:33:46 +0000 (06:33 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Mar 2024 12:35:06 +0000 (13:35 +0100)
commit28cdbbd38a4413b8eff53399b3f872fd4e80db9d
treeec084ba1ef2f3fe5404d130d4ee641a5a82a2111
parent7c787888d164689da8b1b115f3ef562c1e843af4
net/sched: act_mirred: don't override retval if we already lost the skb

[ Upstream commit 166c2c8a6a4dc2e4ceba9e10cfe81c3e469e3210 ]

If we're redirecting the skb, and haven't called tcf_mirred_forward(),
yet, we need to tell the core to drop the skb by setting the retcode
to SHOT. If we have called tcf_mirred_forward(), however, the skb
is out of our hands and returning SHOT will lead to UaF.

Move the retval override to the error path which actually need it.

Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Fixes: e5cf1baf92cb ("act_mirred: use TC_ACT_REINSERT when possible")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/sched/act_mirred.c