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

!7980 Fix CVE-2021-47455 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Yejian <zhengyejian1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/KHB3QGREBFQVT27TNAENV7JRZNRGXSGS/ 
Carlos Llamas (1):
  ptp: fix code indentation issues

Yang Yingliang (1):
  ptp: Fix possible memory leak in ptp_clock_register()


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/I9RBLZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/7980

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents af25a5ba 680da1b0

drivers/ptp/ptp_clock.c

+9 −4
Original line number Diff line number Diff line
@@ -274,15 +274,20 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, 
	/* Create a posix clock and link it to the device. */

	err = posix_clock_register(&ptp->clock, &ptp->dev);

	if (err) {

		if (ptp->pps_source)

			pps_unregister_source(ptp->pps_source);



		if (ptp->kworker)

			kthread_destroy_worker(ptp->kworker);



		put_device(&ptp->dev);



		pr_err("failed to create posix clock\n");

		goto no_clock;

		return ERR_PTR(err);

	}



	return ptp;



no_clock:

	if (ptp->pps_source)

		pps_unregister_source(ptp->pps_source);

no_pps:

	ptp_cleanup_pin_groups(ptp);

no_pin_groups: