Skip to content

Commit

Permalink
ipv6: sr: fix possible use-after-free and null-ptr-deref
Browse files Browse the repository at this point in the history
[ Upstream commit 5559cea ]

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

Fixes: 915d7e5 ("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>
  • Loading branch information
Vasiliy Kovalev authored and gregkh committed Mar 1, 2024
1 parent 6e6065d commit 9e02973
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions net/ipv6/seg6.c
Original file line number Diff line number Diff line change
Expand Up @@ -512,22 +512,24 @@ int __init seg6_init(void)
{
int err;

err = genl_register_family(&seg6_genl_family);
err = register_pernet_subsys(&ip6_segments_ops);
if (err)
goto out;

err = register_pernet_subsys(&ip6_segments_ops);
err = genl_register_family(&seg6_genl_family);
if (err)
goto out_unregister_genl;
goto out_unregister_pernet;

#ifdef CONFIG_IPV6_SEG6_LWTUNNEL
err = seg6_iptunnel_init();
if (err)
goto out_unregister_pernet;
goto out_unregister_genl;

err = seg6_local_init();
if (err)
goto out_unregister_pernet;
if (err) {
seg6_iptunnel_exit();
goto out_unregister_genl;
}
#endif

#ifdef CONFIG_IPV6_SEG6_HMAC
Expand All @@ -548,11 +550,11 @@ int __init seg6_init(void)
#endif
#endif
#ifdef CONFIG_IPV6_SEG6_LWTUNNEL
out_unregister_pernet:
unregister_pernet_subsys(&ip6_segments_ops);
#endif
out_unregister_genl:
genl_unregister_family(&seg6_genl_family);
#endif
out_unregister_pernet:
unregister_pernet_subsys(&ip6_segments_ops);
goto out;
}

Expand Down

0 comments on commit 9e02973

Please sign in to comment.