soc: qcom: geni: Fix NULL pointer dereference
Subsystems (2)
PATCH v2 1/1 soc: qcom: geni: Fix NULL pointer dereference
pdev struct doesn't exists for the devices whose status are disabled from DT node, in such cases NULL is returned from 'of_find_device_by_node' Later when we try to get drvdata from pdev struct NULL pointer dereference is triggered.
Add a NULL check for return values to fix the issue.
We were hitting this issue when one of QUP is disabled.
---
Changes in V2:
- Change variable name 'wrapper_pdev' to 'pdev.
drivers/soc/qcom/qcom-geni-se.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/soc/qcom/qcom-geni-se.c +7 -1
@@ -820,6 +820,7 @@ void geni_remove_earlycon_icc_vote(void)struct geni_wrapper *wrapper;struct device_node *parent;struct device_node *child; +struct platform_device *pdev;if (!earlycon_wrapper)return ;
@@ -829,7 +830,12 @@ void geni_remove_earlycon_icc_vote(void)for_each_child_of_node (parent, child) {if (!of_device_is_compatible (child,"qcom,geni-se-qup" ))continue ; - wrapper =platform_get_drvdata (of_find_device_by_node (child)); + + pdev =of_find_device_by_node (child); +if (!pdev) +continue ; + + wrapper =platform_get_drvdata (pdev);icc_put (wrapper->to_core.path); wrapper->to_core.path =NULL ;
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
Quoted 7 lines · Akash Asthana
pdev struct doesn't exists for the devices whose status are disabled from DT node, in such cases NULL is returned from '
of_find_device_by_node' Later when we try to get drvdata from pdev struct NULL pointer dereference is triggered.Add a NULL check for return values to fix the issue.
Quoted 7 lines
We were hitting this issue when one of QUP is disabled.
Fixes 048eb908a1f2 ("soc: qcom-geni-se: Add interconnect support tofix earlycon crash")
Reported-by Sai Prakash Ranjan <[email protected]>Reviewed-by Matthias Kaehlcke <[email protected]>Signed-off-by Akash Asthana <[email protected]>
Nit: my codeaurora mail address is <[email protected]>. I don't think you have to resend for this small change, hopefully maintainers are ok to fix this when applying.
-Sai
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation