Unverified Commit fad4920f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

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

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XMQ52S5A37IC2UF2B25HBCMTUIMAJG5K/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9E3E4 
 
Link:https://gitee.com/openeuler/kernel/pulls/5994

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 48ef1a81 a967a094

net/ipv6/seg6.c

+11 −9
Original line number Diff line number Diff line
@@ -445,22 +445,24 @@ int __init seg6_init(void) 
{

	int err = -ENOMEM;



	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
@@ -481,11 +483,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;

}