Commit d558ecbc authored by Junhao He's avatar Junhao He Committed by JiangShui
Browse files

coresight: ultrasoc-smb: Config SMB buffer before register sink 

maillist inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8ICOU
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git/commit/?h=fixes&id=830a7f54db102c889a3fe1c0a225f369ac05f07f



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

The SMB dirver register the enable/disable sysfs interface in function
smb_register_sink(), however the buffer depends on the following
configuration to work well. So it'll be possible for user to access an
unreset one.

Move the config buffer operation to before register_sink().
Ignore the return value, if smb_config_inport() fails. That will
cause the hardwares disable trace path to fail, should not affect
SMB driver remove. So we make smb_remove() return success,

Fixes: 06f5c292 ("drivers/coresight: Add UltraSoc System Memory Buffer driver")
Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
Reviewed-by: default avatarJames Clark <james.clark@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarCai Jian <caijian11@h-partners.com>
Link: https://lore.kernel.org/r/20231114133346.30489-3-hejunhao3@huawei.com
parent c05a5ac0

drivers/hwtracing/coresight/ultrasoc-smb.c

+8 −13
Original line number Diff line number Diff line
@@ -582,37 +582,32 @@ static int smb_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = smb_config_inport(dev, true);

	if (ret)

		return ret;



	platform_set_drvdata(pdev, drvdata);

	spin_lock_init(&drvdata->spinlock);

	drvdata->pid = -1;



	ret = smb_register_sink(pdev, drvdata);

	if (ret) {

		smb_config_inport(&pdev->dev, false);

		dev_err(dev, "Failed to register SMB sink\n");

		return ret;

	}



	ret = smb_config_inport(dev, true);

	if (ret) {

		smb_unregister_sink(drvdata);

		return ret;

	}



	platform_set_drvdata(pdev, drvdata);



	return 0;

}



static int smb_remove(struct platform_device *pdev)

{

	struct smb_drv_data *drvdata = platform_get_drvdata(pdev);

	int ret;



	ret = smb_config_inport(&pdev->dev, false);

	if (ret)

		return ret;



	smb_unregister_sink(drvdata);



	smb_config_inport(&pdev->dev, false);



	return 0;

}