Commit e08b2847 authored by Junhao He's avatar Junhao He
Browse files

soc: hisilicon: Add checks against NULL pointer reference 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBS9WQ


CVE: NA

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

The function of ACPI_COMPANION returns a NULL pointer when the device
without an fwnode, so add checks for this to fix NULL pointer reference
at ACPI_COMPANION.

Fixes: efb5bc7b ("soc: hisilicon: Support memory repair driver on Kunpeng SoC")
Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
Signed-off-by: default avatarQizhi Zhang <zhangqizhi3@h-partners.com>
parent ed789a9f

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;