Skip to content

Commit 0f4b20e

Browse files
krzkgregkh
authored andcommitted
slimbus: qcom-ngd: Fix kfree() of static memory on setting driver_override
The driver_override field from platform driver should not be initialized from static memory (string literal) because the core later kfree() it, for example when driver_override is set via sysfs. Use dedicated helper to set driver_override properly. Fixes: 917809e ("slimbus: ngd: Add qcom SLIMBus NGD driver") Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20220419113435.246203-11-krzysztof.kozlowski@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent fb4ac6f commit 0f4b20e

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

drivers/slimbus/qcom-ngd-ctrl.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1434,6 +1434,7 @@ static int of_qcom_slim_ngd_register(struct device *parent,
14341434
const struct of_device_id *match;
14351435
struct device_node *node;
14361436
u32 id;
1437+
int ret;
14371438

14381439
match = of_match_node(qcom_slim_ngd_dt_match, parent->of_node);
14391440
data = match->data;
@@ -1455,7 +1456,17 @@ static int of_qcom_slim_ngd_register(struct device *parent,
14551456
}
14561457
ngd->id = id;
14571458
ngd->pdev->dev.parent = parent;
1458-
ngd->pdev->driver_override = QCOM_SLIM_NGD_DRV_NAME;
1459+
1460+
ret = driver_set_override(&ngd->pdev->dev,
1461+
&ngd->pdev->driver_override,
1462+
QCOM_SLIM_NGD_DRV_NAME,
1463+
strlen(QCOM_SLIM_NGD_DRV_NAME));
1464+
if (ret) {
1465+
platform_device_put(ngd->pdev);
1466+
kfree(ngd);
1467+
of_node_put(node);
1468+
return ret;
1469+
}
14591470
ngd->pdev->dev.of_node = node;
14601471
ctrl->ngd = ngd;
14611472

0 commit comments

Comments
 (0)