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

!6603 [sync] PR-6520: firmware: arm_scmi: Fix double free in SMC transport cleanup path 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/6520 
 
PR sync from: Zhenzeng Su <suzhenzeng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/HKJTFRNVZ3EOCA5T6347NL7I3NHYQHRW/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9HK9F 
 
Link:https://gitee.com/openeuler/kernel/pulls/6603

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 60273d1e 97bfd81f

drivers/firmware/arm_scmi/smc.c

+7 −0
Original line number Diff line number Diff line
@@ -95,6 +95,13 @@ static int smc_chan_free(int id, void *p, void *data) 
	cinfo->transport_info = NULL;

	scmi_info->cinfo = NULL;



	/*

	* Different protocols might share the same chan info, so a previous

	* smc_chan_free call might have already freed the structure.

	*/

	if (!scmi_info)

		return 0;



	scmi_free_channel(cinfo, data, id);



	return 0;