]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
xfrm: state: initialize state_ptrs earlier in xfrm_state_find
authorSabrina Dubroca <sd@queasysnail.net>
Fri, 23 May 2025 15:11:17 +0000 (17:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Aug 2025 08:51:24 +0000 (09:51 +0100)
commit463562f9591742be62ddde3b426a0533ed496955
tree3aec313aa9613a2c150e6a85991756dd8555bc2e
parentd76f2201fe4956e997bea0bd7cd3161a0792bd4f
xfrm: state: initialize state_ptrs earlier in xfrm_state_find

[ Upstream commit 94d077c331730510d5611b438640a292097341f0 ]

In case of preemption, xfrm_state_look_at will find a different
pcpu_id and look up states for that other CPU. If we matched a state
for CPU2 in the state_cache while the lookup started on CPU1, we will
jump to "found", but the "best" state that we got will be ignored and
we will enter the "acquire" block. This block uses state_ptrs, which
isn't initialized at this point.

Let's initialize state_ptrs just after taking rcu_read_lock. This will
also prevent a possible misuse in the future, if someone adjusts this
function.

Reported-by: syzbot+7ed9d47e15e88581dc5b@syzkaller.appspotmail.com
Fixes: e952837f3ddb ("xfrm: state: fix out-of-bounds read during lookup")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/xfrm/xfrm_state.c