* [PATCH v2] iio: vadc: Fix potential dereference of NULL pointer
@ 2022-05-19 10:54 Yongzhi Liu
2022-05-19 15:30 ` Kalle Valo
0 siblings, 1 reply; 5+ messages in thread
From: Yongzhi Liu @ 2022-05-19 10:54 UTC (permalink / raw)
To: amitkarwar, ganapathi017, sharvari.harisangam, huxinming820,
kvalo, davem, edumazet, kuba, pabeni, arend.vanspriel
Cc: linux-wireless, netdev, linux-kernel, fuyq, Yongzhi Liu
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.
Fixes: 0917de94c ("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 | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c
index 34202ba..9fa61fb 100644
--- a/drivers/iio/adc/qcom-spmi-vadc.c
+++ b/drivers/iio/adc/qcom-spmi-vadc.c
@@ -358,14 +358,25 @@ 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;
+ goto err;
+ }
ret = vadc_do_conversion(vadc, prop, &read_1);
if (ret)
goto err;
/* 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;
+ goto err;
+ }
+ }
ret = vadc_do_conversion(vadc, prop, &read_2);
if (ret)
@@ -381,11 +392,21 @@ 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;
+ goto err;
+ }
ret = vadc_do_conversion(vadc, prop, &read_1);
if (ret)
goto err;
prop = vadc_get_channel(vadc, VADC_GND_REF);
+ if (!prop) {
+ dev_err(vadc->dev, "Please define GND channel\n");
+ ret = -ENODEV;
+ goto err;
+ }
ret = vadc_do_conversion(vadc, prop, &read_2);
if (ret)
goto err;
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] iio: vadc: Fix potential dereference of NULL pointer
2022-05-19 10:54 [PATCH v2] iio: vadc: Fix potential dereference of NULL pointer Yongzhi Liu
@ 2022-05-19 15:30 ` Kalle Valo
2022-05-19 16:35 ` 刘永志
0 siblings, 1 reply; 5+ messages in thread
From: Kalle Valo @ 2022-05-19 15:30 UTC (permalink / raw)
To: Yongzhi Liu
Cc: amitkarwar, ganapathi017, sharvari.harisangam, huxinming820,
davem, edumazet, kuba, pabeni, arend.vanspriel, linux-wireless,
netdev, linux-kernel, fuyq
Yongzhi Liu <lyz_cs@pku.edu.cn> writes:
> 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.
>
> Fixes: 0917de94c ("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 | 23 ++++++++++++++++++++++-
> 1 file changed, 22 insertions(+), 1 deletion(-)
Did you sent this to linux-wireless by mistake?
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] iio: vadc: Fix potential dereference of NULL pointer
2022-05-19 15:30 ` Kalle Valo
@ 2022-05-19 16:35 ` 刘永志
0 siblings, 0 replies; 5+ messages in thread
From: 刘永志 @ 2022-05-19 16:35 UTC (permalink / raw)
To: kalle valo
Cc: amitkarwar, ganapathi017, sharvari.harisangam, huxinming820,
davem, edumazet, kuba, pabeni, arend.vanspriel, linux-wireless,
netdev, linux-kernel
> -----Original Messages-----
> From: "Kalle Valo" <kvalo@kernel.org>
> Sent Time: 2022-05-19 23:30:51 (Thursday)
> To: "Yongzhi Liu" <lyz_cs@pku.edu.cn>
> Cc: amitkarwar@gmail.com, ganapathi017@gmail.com, sharvari.harisangam@nxp.com, huxinming820@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, arend.vanspriel@broadcom.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, fuyq@stu.pku.edu.cn
> Subject: Re: [PATCH v2] iio: vadc: Fix potential dereference of NULL pointer
>
> Yongzhi Liu <lyz_cs@pku.edu.cn> writes:
>
> > 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.
> >
> > Fixes: 0917de94c ("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 | 23 ++++++++++++++++++++++-
> > 1 file changed, 22 insertions(+), 1 deletion(-)
>
I'm sorry to send this to linux-wireless by mistake. I will cautiously submit patches later.
> Did you sent this to linux-wireless by mistake?
>
> --
> https://patchwork.kernel.org/project/linux-wireless/list/
>
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] iio: vadc: Fix potential dereference of NULL pointer
@ 2022-05-18 17:31 Matthias Kaehlcke
2022-05-19 5:50 ` [PATCH v2] " Yongzhi Liu
0 siblings, 1 reply; 5+ messages in thread
From: Matthias Kaehlcke @ 2022-05-18 17:31 UTC (permalink / raw)
To: Yongzhi Liu
Cc: agross, bjorn.andersson, jic23, lars, linux-arm-msm, linux-iio,
linux-kernel, fuyq
On Tue, May 17, 2022 at 11:43:00PM -0700, Yongzhi Liu wrote:
> The return value of vadc_get_channel() needs to be checked
> to avoid use of NULL pointer, which is followed by
> the caller 'vadc_do_conversion' of function 'vadc_configure'.
> Fix this by adding the null pointer check on prop
> in function 'vadc_configure'.
>
> Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
> ---
> drivers/iio/adc/qcom-spmi-vadc.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c
> index 34202ba..d99bd72 100644
> --- a/drivers/iio/adc/qcom-spmi-vadc.c
> +++ b/drivers/iio/adc/qcom-spmi-vadc.c
> @@ -210,6 +210,9 @@ static int vadc_configure(struct vadc_priv *vadc,
> u8 decimation, mode_ctrl;
> int ret;
>
> + if (!prop)
> + return -ENODEV;
> +
> /* Mode selection */
> mode_ctrl = (VADC_OP_MODE_NORMAL << VADC_OP_MODE_SHIFT) |
> VADC_ADC_TRIM_EN | VADC_AMUX_TRIM_EN;
Shouldn't the check be done in vadc_measure_ref_points() where 'prop' is
obtained, rather than deep down in the call chain? For example
vadc_do_conversion() would also dereference the NULL pointer unless one
of the prior function calls fails.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] iio: vadc: Fix potential dereference of NULL pointer
2022-05-18 17:31 [PATCH] " Matthias Kaehlcke
@ 2022-05-19 5:50 ` Yongzhi Liu
2022-05-20 17:13 ` Jonathan Cameron
0 siblings, 1 reply; 5+ messages in thread
From: Yongzhi Liu @ 2022-05-19 5:50 UTC (permalink / raw)
To: agross, bjorn.andersson, jic23, lars
Cc: linux-arm-msm, linux-iio, linux-kernel, fuyq, Yongzhi Liu
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.
Fixes: 0917de94c ("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 | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c
index 34202ba..9fa61fb 100644
--- a/drivers/iio/adc/qcom-spmi-vadc.c
+++ b/drivers/iio/adc/qcom-spmi-vadc.c
@@ -358,14 +358,25 @@ 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;
+ goto err;
+ }
ret = vadc_do_conversion(vadc, prop, &read_1);
if (ret)
goto err;
/* 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;
+ goto err;
+ }
+ }
ret = vadc_do_conversion(vadc, prop, &read_2);
if (ret)
@@ -381,11 +392,21 @@ 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;
+ goto err;
+ }
ret = vadc_do_conversion(vadc, prop, &read_1);
if (ret)
goto err;
prop = vadc_get_channel(vadc, VADC_GND_REF);
+ if (!prop) {
+ dev_err(vadc->dev, "Please define GND channel\n");
+ ret = -ENODEV;
+ goto err;
+ }
ret = vadc_do_conversion(vadc, prop, &read_2);
if (ret)
goto err;
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] iio: vadc: Fix potential dereference of NULL pointer
2022-05-19 5:50 ` [PATCH v2] " Yongzhi Liu
@ 2022-05-20 17:13 ` Jonathan Cameron
0 siblings, 0 replies; 5+ messages in thread
From: Jonathan Cameron @ 2022-05-20 17:13 UTC (permalink / raw)
To: Yongzhi Liu
Cc: agross, bjorn.andersson, jic23, lars, linux-arm-msm, linux-iio,
linux-kernel, fuyq
On Wed, 18 May 2022 22:50:55 -0700
Yongzhi Liu <lyz_cs@pku.edu.cn> wrote:
> 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.
>
> Fixes: 0917de94c ("iio: vadc: Qualcomm SPMI PMIC voltage ADC driver")
>
> Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
This function has a lot of goto err; where err just results in
a print.
My suggestion is to just drop that print and use
error specific prints as you have done here, then use direct returns.
> ---
> drivers/iio/adc/qcom-spmi-vadc.c | 23 ++++++++++++++++++++++-
> 1 file changed, 22 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c
> index 34202ba..9fa61fb 100644
> --- a/drivers/iio/adc/qcom-spmi-vadc.c
> +++ b/drivers/iio/adc/qcom-spmi-vadc.c
> @@ -358,14 +358,25 @@ 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;
> + goto err;
> + }
> ret = vadc_do_conversion(vadc, prop, &read_1);
> if (ret)
> goto err;
>
> /* 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;
> + goto err;
> + }
> + }
>
> ret = vadc_do_conversion(vadc, prop, &read_2);
> if (ret)
> @@ -381,11 +392,21 @@ 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;
> + goto err;
> + }
> ret = vadc_do_conversion(vadc, prop, &read_1);
> if (ret)
> goto err;
>
> prop = vadc_get_channel(vadc, VADC_GND_REF);
> + if (!prop) {
> + dev_err(vadc->dev, "Please define GND channel\n");
> + ret = -ENODEV;
> + goto err;
> + }
> ret = vadc_do_conversion(vadc, prop, &read_2);
> if (ret)
> goto err;
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-20 17:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-19 10:54 [PATCH v2] iio: vadc: Fix potential dereference of NULL pointer Yongzhi Liu
2022-05-19 15:30 ` Kalle Valo
2022-05-19 16:35 ` 刘永志
-- strict thread matches above, loose matches on Subject: below --
2022-05-18 17:31 [PATCH] " Matthias Kaehlcke
2022-05-19 5:50 ` [PATCH v2] " Yongzhi Liu
2022-05-20 17:13 ` Jonathan Cameron
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.