net: xfrm: assign the per_cpu_ptr pointer before return
Subsystems (4)
PATCH 1/1 net: xfrm: assign the per_cpu_ptr pointer before return
In ipcomp_alloc_scratches, if the vmalloc fails, there leaves an oudated pointer in *per_cpu_ptr(scratches, i). However, in the error handling of ipcomp_init_state, if ipcomp_alloc_scratches fails, it will invoke ipcomp_free_scratches directly. This functio will vfree the per_cpu_ptr pointer. If the pointer points to an invalid memory, the kernel crashes.
Fix this by moving the assignment of per_cpu_ptr point before return.
Call Trace: ipcomp_free_scratches+0xbc/0x160 net/xfrm/xfrm_ipcomp.c:203 ipcomp_free_data net/xfrm/xfrm_ipcomp.c:312 [inline] ipcomp_init_state+0x77c/0xa40 net/xfrm/xfrm_ipcomp.c:364 ipcomp6_init_state+0xc2/0x700 net/ipv6/ipcomp6.c:154 __xfrm_init_state+0x995/0x15c0 net/xfrm/xfrm_state.c:2648 xfrm_init_state+0x1a/0x70 net/xfrm/xfrm_state.c:2675 pfkey_msg2xfrm_state net/key/af_key.c:1287 [inline] pfkey_add+0x1a64/0x2cd0 net/key/af_key.c:1504 pfkey_process+0x685/0x7e0 net/key/af_key.c:2837 pfkey_sendmsg+0x43a/0x820 net/key/af_key.c:3676 sock_sendmsg_nosec net/socket.c:703 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:723
--- net/xfrm/xfrm_ipcomp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xfrm/xfrm_ipcomp.c +1 -1
@@ -223,9 +223,9 @@ static void * __percpu *ipcomp_alloc_scratches(void)void *scratch; scratch =vmalloc_node (IPCOMP_SCRATCH_SIZE ,cpu_to_node (i)); + *per_cpu_ptr (scratches, i) = scratch;if (!scratch)return NULL ; - *per_cpu_ptr (scratches, i) = scratch; }return scratches;
Signature · 1 line
2.25.1
Herbert Xu
maintainernet/xfrm/xfrm_ipcomp.c static void * __percpu *ipcomp_alloc_scratches(void) · line 228
Quoted 13 lines · Dongliang Mu
net/xfrm/xfrm_ipcomp.c +1
-1@@ -223,9 +223,9 @@ static void * __percpu *ipcomp_alloc_scratches(void)void *scratch; scratch =vmalloc_node (IPCOMP_SCRATCH_SIZE ,cpu_to_node (i)); + *per_cpu_ptr (scratches, i) = scratch;if (!scratch)return NULL ; - *per_cpu_ptr (scratches, i) = scratch;
scratches comes from alloc_percpu so it should already be zeroed.
Cheers,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Quoted 10 lines · Herbert Xu
Quoted 8 lines · Dongliang Mu
net/xfrm/xfrm_ipcomp.c +0
-0@@ -223,9 +223,9 @@ static void * __percpu *ipcomp_alloc_scratches(void)void *scratch;
Quoted 7 lines
net/xfrm/xfrm_ipcomp.c static void * __percpu *ipcomp_alloc_scratches(void) · line 228
Quoted 5 lines
net/xfrm/xfrm_ipcomp.c +1
-1scratch =vmalloc_node (IPCOMP_SCRATCH_SIZE ,cpu_to_node (i)); + *per_cpu_ptr (scratches, i) = scratch;if (!scratch)return NULL ; - *per_cpu_ptr (scratches, i) = scratch;scratches comes from
alloc_percpuso it should already be zeroed.
Correct.
:\ Then I have no idea how this crash occurs. This crash report does not have any reproducer. It seems like a random crash, but I am not sure.
If you have any patch for this crash, please let me know.
Quoted 6 lines
Cheers,
--
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Herbert Xu
maintainerQuoted 6 lines · Dongliang Mu
:\ Then I have no idea how this crash occurs. This crash report does not have any reproducer. It seems like a random crash, but I am not sure.
If you have any patch for this crash, please let me know.
I don't have any ideas either, sorry. But my guess would be that there is corruption somewhere else that's showing up in ipcomp.
Cheers,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt