Commit 40781bfb authored by Chen Zhongjin's avatar Chen Zhongjin Committed by Steffen Klassert

xfrm: Fix ignored return value in xfrm6_init()

When IPv6 module initializing in xfrm6_init(), register_pernet_subsys()
is possible to fail but its return value is ignored.

If IPv6 initialization fails later and xfrm6_fini() is called,
removing uninitialized list in xfrm6_net_ops will cause null-ptr-deref:

KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f]
CPU: 1 PID: 330 Comm: insmod
RIP: 0010:unregister_pernet_operations+0xc9/0x450
Call Trace:
 <TASK>
 unregister_pernet_subsys+0x31/0x3e
 xfrm6_fini+0x16/0x30 [ipv6]
 ip6_route_init+0xcd/0x128 [ipv6]
 inet6_init+0x29c/0x602 [ipv6]
 ...

Fix it by catching the error return value of register_pernet_subsys().

Fixes: 8d068875 ("xfrm: make gc_thresh configurable in all namespaces")
Signed-off-by: default avatarChen Zhongjin <chenzhongjin@huawei.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent b97df039
...@@ -287,9 +287,13 @@ int __init xfrm6_init(void) ...@@ -287,9 +287,13 @@ int __init xfrm6_init(void)
if (ret) if (ret)
goto out_state; goto out_state;
register_pernet_subsys(&xfrm6_net_ops); ret = register_pernet_subsys(&xfrm6_net_ops);
if (ret)
goto out_protocol;
out: out:
return ret; return ret;
out_protocol:
xfrm6_protocol_fini();
out_state: out_state:
xfrm6_state_fini(); xfrm6_state_fini();
out_policy: out_policy:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment