coresight: Fixes device's owner field for registered using coresight_init_driver()
[ Upstream commit 9f52aecc952ddf307571517d5c91136c8c4e87c9 ]
The coresight_init_driver() of the coresight-core module is called from
the sub coresgiht device (such as tmc/stm/funnle/...) module. It calls
amba_driver_register() and Platform_driver_register(), which are macro
functions that use the coresight-core's module to initialize the caller's
owner field. Therefore, when the sub coresight device calls
coresight_init_driver(), an incorrect THIS_MODULE value is captured.
The sub coesgiht modules can be removed while their callbacks are
running, resulting in a general protection failure.
Add module parameter to coresight_init_driver() so can be called
with the module of the callback.
Fixes: 075b7cd7ad ("coresight: Add helpers registering/removing both AMBA and platform drivers")
Signed-off-by: Junhao He <hejunhao3@huawei.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20240918035327.9710-1-hejunhao3@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
677da45548
commit
1183a72221
@@ -702,7 +702,7 @@ static int __init catu_init(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = coresight_init_driver("catu", &catu_driver, &catu_platform_driver);
|
||||
ret = coresight_init_driver("catu", &catu_driver, &catu_platform_driver, THIS_MODULE);
|
||||
tmc_etr_set_catu_ops(&etr_catu_buf_ops);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -1422,17 +1422,17 @@ module_init(coresight_init);
|
||||
module_exit(coresight_exit);
|
||||
|
||||
int coresight_init_driver(const char *drv, struct amba_driver *amba_drv,
|
||||
struct platform_driver *pdev_drv)
|
||||
struct platform_driver *pdev_drv, struct module *owner)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = amba_driver_register(amba_drv);
|
||||
ret = __amba_driver_register(amba_drv, owner);
|
||||
if (ret) {
|
||||
pr_err("%s: error registering AMBA driver\n", drv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = platform_driver_register(pdev_drv);
|
||||
ret = __platform_driver_register(pdev_drv, owner);
|
||||
if (!ret)
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -774,7 +774,8 @@ static struct platform_driver debug_platform_driver = {
|
||||
|
||||
static int __init debug_init(void)
|
||||
{
|
||||
return coresight_init_driver("debug", &debug_driver, &debug_platform_driver);
|
||||
return coresight_init_driver("debug", &debug_driver, &debug_platform_driver,
|
||||
THIS_MODULE);
|
||||
}
|
||||
|
||||
static void __exit debug_exit(void)
|
||||
|
||||
@@ -433,7 +433,8 @@ static struct amba_driver dynamic_funnel_driver = {
|
||||
|
||||
static int __init funnel_init(void)
|
||||
{
|
||||
return coresight_init_driver("funnel", &dynamic_funnel_driver, &funnel_driver);
|
||||
return coresight_init_driver("funnel", &dynamic_funnel_driver, &funnel_driver,
|
||||
THIS_MODULE);
|
||||
}
|
||||
|
||||
static void __exit funnel_exit(void)
|
||||
|
||||
@@ -438,7 +438,8 @@ static struct amba_driver dynamic_replicator_driver = {
|
||||
|
||||
static int __init replicator_init(void)
|
||||
{
|
||||
return coresight_init_driver("replicator", &dynamic_replicator_driver, &replicator_driver);
|
||||
return coresight_init_driver("replicator", &dynamic_replicator_driver, &replicator_driver,
|
||||
THIS_MODULE);
|
||||
}
|
||||
|
||||
static void __exit replicator_exit(void)
|
||||
|
||||
@@ -1047,7 +1047,7 @@ static struct platform_driver stm_platform_driver = {
|
||||
|
||||
static int __init stm_init(void)
|
||||
{
|
||||
return coresight_init_driver("stm", &stm_driver, &stm_platform_driver);
|
||||
return coresight_init_driver("stm", &stm_driver, &stm_platform_driver, THIS_MODULE);
|
||||
}
|
||||
|
||||
static void __exit stm_exit(void)
|
||||
|
||||
@@ -741,7 +741,7 @@ static struct platform_driver tmc_platform_driver = {
|
||||
|
||||
static int __init tmc_init(void)
|
||||
{
|
||||
return coresight_init_driver("tmc", &tmc_driver, &tmc_platform_driver);
|
||||
return coresight_init_driver("tmc", &tmc_driver, &tmc_platform_driver, THIS_MODULE);
|
||||
}
|
||||
|
||||
static void __exit tmc_exit(void)
|
||||
|
||||
@@ -318,7 +318,7 @@ static struct platform_driver tpiu_platform_driver = {
|
||||
|
||||
static int __init tpiu_init(void)
|
||||
{
|
||||
return coresight_init_driver("tpiu", &tpiu_driver, &tpiu_platform_driver);
|
||||
return coresight_init_driver("tpiu", &tpiu_driver, &tpiu_platform_driver, THIS_MODULE);
|
||||
}
|
||||
|
||||
static void __exit tpiu_exit(void)
|
||||
|
||||
@@ -683,7 +683,7 @@ coresight_find_output_type(struct coresight_platform_data *pdata,
|
||||
union coresight_dev_subtype subtype);
|
||||
|
||||
int coresight_init_driver(const char *drv, struct amba_driver *amba_drv,
|
||||
struct platform_driver *pdev_drv);
|
||||
struct platform_driver *pdev_drv, struct module *owner);
|
||||
|
||||
void coresight_remove_driver(struct amba_driver *amba_drv,
|
||||
struct platform_driver *pdev_drv);
|
||||
|
||||
Reference in New Issue
Block a user