From: Yongzhi Liu <lyz_cs@pku.edu.cn>
To: agross@kernel.org, bjorn.andersson@linaro.org, jic23@kernel.org,
lars@metafoo.de, svarbanov@mm-sol.com, iivanov@mm-sol.com,
jonathan.cameron@huawei.com
Cc: linux-arm-msm@vger.kernel.org, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org, fuyq@stu.pku.edu.cn,
Yongzhi Liu <lyz_cs@pku.edu.cn>
Subject: [PATCH v3] iio: vadc: Fix potential dereference of NULL pointer
Date: Fri, 20 May 2022 20:35:35 -0700 [thread overview]
Message-ID: <1653104135-36259-1-git-send-email-lyz_cs@pku.edu.cn> (raw)
In-Reply-To: <20220520181323.00002892@huawei.com>
The return value of vadc_get_channel() needs to be checked to
avoid use of NULL pointer. Fix this by adding the null pointer
check on prop and dropping general error prints.
Fixes: 0917de94c02f ("iio: vadc: Qualcomm SPMI PMIC voltage ADC driver")
Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
---
drivers/iio/adc/qcom-spmi-vadc.c | 38 ++++++++++++++++++++++++++++----------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c
index 34202ba..43a52b1 100644
--- a/drivers/iio/adc/qcom-spmi-vadc.c
+++ b/drivers/iio/adc/qcom-spmi-vadc.c
@@ -358,22 +358,33 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)
vadc->graph[VADC_CALIB_ABSOLUTE].dx = VADC_ABSOLUTE_RANGE_UV;
prop = vadc_get_channel(vadc, VADC_REF_1250MV);
+ if (!prop) {
+ dev_err(vadc->dev, "Please define 1.25V channel\n");
+ ret = -ENODEV;
+ return ret;
+ }
ret = vadc_do_conversion(vadc, prop, &read_1);
if (ret)
- goto err;
+ return ret;
/* Try with buffered 625mV channel first */
prop = vadc_get_channel(vadc, VADC_SPARE1);
- if (!prop)
+ if (!prop) {
prop = vadc_get_channel(vadc, VADC_REF_625MV);
+ if (!prop) {
+ dev_err(vadc->dev, "Please define 0.625V channel\n");
+ ret = -ENODEV;
+ return ret;
+ }
+ }
ret = vadc_do_conversion(vadc, prop, &read_2);
if (ret)
- goto err;
+ return ret;
if (read_1 == read_2) {
ret = -EINVAL;
- goto err;
+ return ret;
}
vadc->graph[VADC_CALIB_ABSOLUTE].dy = read_1 - read_2;
@@ -381,25 +392,32 @@ static int vadc_measure_ref_points(struct vadc_priv *vadc)
/* Ratiometric calibration */
prop = vadc_get_channel(vadc, VADC_VDD_VADC);
+ if (!prop) {
+ dev_err(vadc->dev, "Please define VDD channel\n");
+ ret = -ENODEV;
+ return ret;
+ }
ret = vadc_do_conversion(vadc, prop, &read_1);
if (ret)
- goto err;
+ return ret;
prop = vadc_get_channel(vadc, VADC_GND_REF);
+ if (!prop) {
+ dev_err(vadc->dev, "Please define GND channel\n");
+ ret = -ENODEV;
+ return ret;
+ }
ret = vadc_do_conversion(vadc, prop, &read_2);
if (ret)
- goto err;
+ return ret;
if (read_1 == read_2) {
ret = -EINVAL;
- goto err;
+ return ret;
}
vadc->graph[VADC_CALIB_RATIOMETRIC].dy = read_1 - read_2;
vadc->graph[VADC_CALIB_RATIOMETRIC].gnd = read_2;
-err:
- if (ret)
- dev_err(vadc->dev, "measure reference points failed\n");
return ret;
}
--
2.7.4
next prev parent reply other threads:[~2022-05-21 3:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-18 6:43 [PATCH] iio: vadc: Fix potential dereference of NULL pointer Yongzhi Liu
2022-05-18 17:31 ` Matthias Kaehlcke
2022-05-19 5:50 ` [PATCH v2] " Yongzhi Liu
2022-05-20 17:13 ` Jonathan Cameron
2022-05-21 3:31 ` [PATCH] hv_netvsc: " Yongzhi Liu
2022-05-21 3:34 ` 刘永志
2022-05-23 15:21 ` Andy Shevchenko
2022-05-23 15:45 ` 刘永志
2022-05-21 3:35 ` Yongzhi Liu [this message]
2022-05-22 11:01 ` [PATCH v3] iio: vadc: " Jonathan Cameron
2022-05-22 16:53 ` [PATCH v4] " Yongzhi Liu
2022-06-03 15:02 ` Jonathan Cameron
2022-06-03 15:20 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1653104135-36259-1-git-send-email-lyz_cs@pku.edu.cn \
--to=lyz_cs@pku.edu.cn \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=fuyq@stu.pku.edu.cn \
--cc=iivanov@mm-sol.com \
--cc=jic23@kernel.org \
--cc=jonathan.cameron@huawei.com \
--cc=lars@metafoo.de \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=svarbanov@mm-sol.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).