xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

soc: qcom: aoss: Fix the out of bound usage of cooling_devs

Browse Source 
commit a89f355e469dcda129c2522be4fdba00c1c74c83 upstream.

In "qmp_cooling_devices_register", the count value is initially
QMP_NUM_COOLING_RESOURCES, which is 2. Based on the initial count value,
the memory for cooling_devs is allocated. Then while calling the
"qmp_cooling_device_add" function, count value is post-incremented for
each child node.

This makes the out of bound access to the cooling_dev array. Fix it by
passing the QMP_NUM_COOLING_RESOURCES definition to devm_kzalloc() and
initializing the count to 0.

While at it, let's also free the memory allocated to cooling_dev if no
cooling device is found in DT and during unroll phase.

Cc: stable@vger.kernel.org # 5.4
Fixes: 05589b30b2 ("soc: qcom: Extend AOSS QMP driver to support resources that are used to wake up the SoC.")
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20210629153249.73428-1-manivannan.sadhasivam@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Manivannan Sadhasivam
2021-06-29 21:02:49 +05:30
committed by Greg Kroah-Hartman
parent 610e8b2621
commit e80c45dbe2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/soc/qcom/qcom_aoss.c
View File

@@ -476,12 +476,12 @@ static int qmp_cooling_device_add(struct qmp *qmp,
static int qmp_cooling_devices_register(struct qmp *qmp) static int qmp_cooling_devices_register(struct qmp *qmp)
{ {
struct device_node *np, *child; struct device_node *np, *child;
int count = QMP_NUM_COOLING_RESOURCES; int count = 0;
int ret; int ret;
np = qmp->dev->of_node; np = qmp->dev->of_node;
qmp->cooling_devs = devm_kcalloc(qmp->dev, count, qmp->cooling_devs = devm_kcalloc(qmp->dev, QMP_NUM_COOLING_RESOURCES,
sizeof(*qmp->cooling_devs), sizeof(*qmp->cooling_devs),
GFP_KERNEL); GFP_KERNEL);
@@ -497,12 +497,16 @@ static int qmp_cooling_devices_register(struct qmp *qmp)
goto unroll; goto unroll;
} }
if (!count)
devm_kfree(qmp->dev, qmp->cooling_devs);
return 0; return 0;
unroll: unroll:
while (--count >= 0) while (--count >= 0)
thermal_cooling_device_unregister thermal_cooling_device_unregister
(qmp->cooling_devs[count].cdev); (qmp->cooling_devs[count].cdev);
devm_kfree(qmp->dev, qmp->cooling_devs);
return ret; return ret;
} }