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

!15460 v2 soc: hisilicon: Add checks against NULL pointer reference 

Merge Pull Request from: @ci-robot 
 
PR sync from: Junhao He <hejunhao3@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/3LINH6UPVMHACVK5JWNDV5L4HK35I6VQ/ 
 
https://gitee.com/openeuler/kernel/issues/IBS9WQ 
 
Link:https://gitee.com/openeuler/kernel/pulls/15460

 

Reviewed-by: default avatarXiaoFei Tan <tanxiaofei@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents a9a0f56a e08b2847

drivers/soc/hisilicon/hisi_mem_ras.c

+7 −3
Original line number Diff line number Diff line
@@ -43,16 +43,20 @@ static int hisi_mem_get_pcc_chan_id(struct hisi_mem_dev *hdev) 
	struct platform_device *pdev = hdev->pdev;

	struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);

	struct hisi_mem_register_ctx ctx = {0};

	acpi_handle handle = adev->handle;

	acpi_status status;



	if (!acpi_has_method(handle, METHOD_NAME__CRS)) {

	if (!adev) {

		dev_err(&pdev->dev, "ACPI companion missing\n");

		return -ENODEV;

	}



	if (!acpi_has_method(adev->handle, METHOD_NAME__CRS)) {

		dev_err(&pdev->dev, "No _CRS method.\n");

		return -ENODEV;

	}



	ctx.dev = &pdev->dev;

	status = acpi_walk_resources(handle, METHOD_NAME__CRS,

	status = acpi_walk_resources(adev->handle, METHOD_NAME__CRS,

				     hisi_mem_get_chan_id_cb, &ctx);

	if (ACPI_FAILURE(status))

		return ctx.err;