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

i2c: qcom-cci: don't put a device tree node before i2c_add_adapter()

Browse Source 
commit 02a4a69667a2ad32f3b52ca906f19628fbdd8a01 upstream.

There is a minor chance for a race, if a pointer to an i2c-bus subnode
is stored and then reused after releasing its reference, and it would
be sufficient to get one more reference under a loop over children
subnodes.

Fixes: e517526195 ("i2c: Add Qualcomm CCI I2C driver")
Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Vladimir Zapolskiy
2022-02-03 18:47:03 +02:00
committed by Greg Kroah-Hartman
parent b5b2a92117
commit e3fdbc40b7
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/i2c/busses/i2c-qcom-cci.c
View File

@@ -558,7 +558,7 @@ static int cci_probe(struct platform_device *pdev)
cci->master[idx].adap.quirks = &cci->data->quirks; cci->master[idx].adap.quirks = &cci->data->quirks;
cci->master[idx].adap.algo = &cci_algo; cci->master[idx].adap.algo = &cci_algo;
cci->master[idx].adap.dev.parent = dev; cci->master[idx].adap.dev.parent = dev;
cci->master[idx].adap.dev.of_node = child; cci->master[idx].adap.dev.of_node = of_node_get(child);
cci->master[idx].master = idx; cci->master[idx].master = idx;
cci->master[idx].cci = cci; cci->master[idx].cci = cci;
@@ -643,9 +643,11 @@ static int cci_probe(struct platform_device *pdev)
continue; continue;
ret = i2c_add_adapter(&cci->master[i].adap); ret = i2c_add_adapter(&cci->master[i].adap);
if (ret < 0) if (ret < 0) {
of_node_put(cci->master[i].adap.dev.of_node);
goto error_i2c; goto error_i2c;
} }
}
pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC); pm_runtime_set_autosuspend_delay(dev, MSEC_PER_SEC);
pm_runtime_use_autosuspend(dev); pm_runtime_use_autosuspend(dev);
@@ -656,8 +658,10 @@ static int cci_probe(struct platform_device *pdev)
error_i2c: error_i2c:
for (--i ; i >= 0; i--) { for (--i ; i >= 0; i--) {
if (cci->master[i].cci) if (cci->master[i].cci) {
i2c_del_adapter(&cci->master[i].adap); i2c_del_adapter(&cci->master[i].adap);
of_node_put(cci->master[i].adap.dev.of_node);
}
} }
error: error:
disable_irq(cci->irq); disable_irq(cci->irq);
@@ -673,8 +677,10 @@ static int cci_remove(struct platform_device *pdev)
int i; int i;
for (i = 0; i < cci->data->num_masters; i++) { for (i = 0; i < cci->data->num_masters; i++) {
if (cci->master[i].cci) if (cci->master[i].cci) {
i2c_del_adapter(&cci->master[i].adap); i2c_del_adapter(&cci->master[i].adap);
of_node_put(cci->master[i].adap.dev.of_node);
}
cci_halt(cci, i); cci_halt(cci, i);
} }