]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
xfrm: Fix xfrm migrate issues when address family changes
authorYan Yan <evitayan@google.com>
Wed, 19 Jan 2022 00:00:14 +0000 (16:00 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 23 Mar 2022 08:00:33 +0000 (09:00 +0100)
commite96d550cc635a3f4d061251ee9817674e1cf3e9e
tree65cf673a5f0fcbc6f96830b0f4aee08b07d904b3
parent1e6730483a6edd8f31becef8df0d0f9e2b258ae3
xfrm: Fix xfrm migrate issues when address family changes

[ Upstream commit e03c3bba351f99ad932e8f06baa9da1afc418e02 ]

xfrm_migrate cannot handle address family change of an xfrm_state.
The symptons are the xfrm_state will be migrated to a wrong address,
and sending as well as receiving packets wil be broken.

This commit fixes it by breaking the original xfrm_state_clone
method into two steps so as to update the props.family before
running xfrm_init_state. As the result, xfrm_state's inner mode,
outer mode, type and IP header length in xfrm_state_migrate can
be updated with the new address family.

Tested with additions to Android's kernel unit test suite:
https://android-review.googlesource.com/c/kernel/tests/+/1885354

Signed-off-by: Yan Yan <evitayan@google.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/xfrm/xfrm_state.c