xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv6: sr: fix possible use-after-free and null-ptr-deref

Browse Source 
[ Upstream commit 5559cea2d5aa3018a5f00dd2aca3427ba09b386b ]

The pernet operations structure for the subsystem must be registered
before registering the generic netlink family.

Fixes: 915d7e5e59 ("ipv6: sr: add code base for control plane support of SR-IPv6")
Signed-off-by: Vasiliy Kovalev <kovalev@altlinux.org>
Link: https://lore.kernel.org/r/20240215202717.29815-1-kovalev@altlinux.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Vasiliy Kovalev
2024-02-15 23:27:17 +03:00
committed by Greg Kroah-Hartman
parent d9b5e2b7a8
commit 65c38f23d1
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
net/ipv6/seg6.c
View File

@@ -451,22 +451,24 @@ int __init seg6_init(void)
{ {
int err; int err;
err = genl_register_family(&seg6_genl_family); err = register_pernet_subsys(&ip6_segments_ops);
if (err) if (err)
goto out; goto out;
err = register_pernet_subsys(&ip6_segments_ops); err = genl_register_family(&seg6_genl_family);
if (err) if (err)
goto out_unregister_genl; goto out_unregister_pernet;
#ifdef CONFIG_IPV6_SEG6_LWTUNNEL #ifdef CONFIG_IPV6_SEG6_LWTUNNEL
err = seg6_iptunnel_init(); err = seg6_iptunnel_init();
if (err) if (err)
goto out_unregister_pernet; goto out_unregister_genl;
err = seg6_local_init(); err = seg6_local_init();
if (err) if (err) {
goto out_unregister_pernet; seg6_iptunnel_exit();
goto out_unregister_genl;
}
#endif #endif
#ifdef CONFIG_IPV6_SEG6_HMAC #ifdef CONFIG_IPV6_SEG6_HMAC
@@ -487,11 +489,11 @@ out_unregister_iptun:
#endif #endif
#endif #endif
#ifdef CONFIG_IPV6_SEG6_LWTUNNEL #ifdef CONFIG_IPV6_SEG6_LWTUNNEL
out_unregister_pernet:
unregister_pernet_subsys(&ip6_segments_ops);
#endif
out_unregister_genl: out_unregister_genl:
genl_unregister_family(&seg6_genl_family); genl_unregister_family(&seg6_genl_family);
#endif
out_unregister_pernet:
unregister_pernet_subsys(&ip6_segments_ops);
goto out; goto out;
} }