Commit 2e480726 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Junhao He
Browse files

coresight: etm4x: Ensure valid drvdata and clock before clk_put() 

mainline inclusion
from mainline-v6.6-rc1
commit a4621fd1
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I89TNS
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a4621fd1d4fd04fe2d8105a4d64e85cdc4a259b1



--------------------------------

This validates 'drvdata' and 'drvdata->pclk' clock before calling clk_put()
in etm4_remove_platform_dev(). The problem was detected using Smatch static
checker as reported.

Fixes: 73d779a0 ("coresight: etm4x: Change etm4_platform_driver driver for MMIO devices")
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: James Clark <james.clark@arm.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Closes: https://lists.linaro.org/archives/list/coresight@lists.linaro.org/thread/G4N6P4OXELPLLQSNU3GU2MR4LOLRXRMJ/


Reviewed-by: default avatarJames Clark <james.clark@arm.com>
Reviewed-by: default avatarMike Leach <mike.leach@lnaro.org>
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20230817035926.157370-1-anshuman.khandual@arm.com


Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
parent 5a5866d8

drivers/hwtracing/coresight/coresight-etm4x-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2148,7 +2148,7 @@ static int __exit etm4_remove_platform_dev(struct platform_device *pdev) 
		ret = etm4_remove_dev(drvdata);

	pm_runtime_disable(&pdev->dev);



	if (drvdata->pclk)

	if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk))

		clk_put(drvdata->pclk);



	return ret;