]> 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)
committerSteffen Klassert <steffen.klassert@secunet.com>
Tue, 3 Jun 2025 13:39:48 +0000 (15:39 +0200)
commit94d077c331730510d5611b438640a292097341f0
tree6609e9bbdf95ece8523996062fd770a915b8c05b
parentb56bbaf8c9ffe02468f6ba8757668e95dda7e62c
xfrm: state: initialize state_ptrs earlier in xfrm_state_find

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>
net/xfrm/xfrm_state.c