]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ipv6: sr: fix incorrect unregister order
authorHangbin Liu <liuhangbin@gmail.com>
Thu, 9 May 2024 13:18:11 +0000 (21:18 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Jun 2024 11:39:26 +0000 (13:39 +0200)
[ Upstream commit 6e370a771d2985107e82d0f6174381c1acb49c20 ]

Commit 5559cea2d5aa ("ipv6: sr: fix possible use-after-free and
null-ptr-deref") changed the register order in seg6_init(). But the
unregister order in seg6_exit() is not updated.

Fixes: 5559cea2d5aa ("ipv6: sr: fix possible use-after-free and null-ptr-deref")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/20240509131812.1662197-3-liuhangbin@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/ipv6/seg6.c

index d626e0767a069a3ddec10e49c77cc9e271061464..846c3abbcfb41c6525176187f1d007358eccdafd 100644 (file)
@@ -562,6 +562,6 @@ void seg6_exit(void)
        seg6_local_exit();
        seg6_iptunnel_exit();
 #endif
-       unregister_pernet_subsys(&ip6_segments_ops);
        genl_unregister_family(&seg6_genl_family);
+       unregister_pernet_subsys(&ip6_segments_ops);
 }