Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af794857 authored by Satyajit Desai's avatar Satyajit Desai
Browse files

coresight: tmc: Avoid NULL pointer dereference 



Add NULL pointer check to avoid kernel NULL pointer dereference.

Change-Id: Ib010b05f960a8defeeea123b4f384610ae8e78e7
Signed-off-by: default avatarSatyajit Desai <sadesai@codeaurora.org>
parent 191ff2f4

drivers/hwtracing/coresight/coresight-tmc.c

+7 −11
Original line number Diff line number Diff line
@@ -497,14 +497,12 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) 
	struct coresight_desc desc = { 0 };

	struct device_node *np = adev->dev.of_node;



	if (np) {

	pdata = of_get_coresight_platform_data(dev, np);

	if (IS_ERR(pdata)) {

		ret = PTR_ERR(pdata);

		goto out;

	}

	adev->dev.platform_data = pdata;

	}



	ret = -ENOMEM;

	drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
@@ -531,9 +529,7 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) 
	drvdata->memwidth = tmc_get_memwidth(devid);



	if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) {

		if (np)

			ret = of_property_read_u32(np,

						   "arm,buffer-size",

		ret = of_property_read_u32(np, "arm,buffer-size",

					   &drvdata->size);

		if (ret)

			drvdata->size = SZ_1M;