LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* Re: [PATCH] iio: adc: ad7192: fix null de-ref crash during probe
@ 2020-04-06 19:46 Markus Elfring
2020-04-07 4:59 ` Ardelean, Alexandru
0 siblings, 1 reply; 3+ messages in thread
From: Markus Elfring @ 2020-04-06 19:46 UTC (permalink / raw)
To: Alexandru Ardelean, linux-iio
Cc: Alexandru Tachici, Jonathan Cameron, linux-kernel
> After that patch 'spi_get_device_id(spi)' returns NULL, so this crashes
> during probe with null de-ref.
How do you think about to use the term “null pointer dereference”
in the commit message?
> Fixes 66614ab2be38: ("staging: iio: adc: ad7192: removed spi_device_id")
Please correct this tag.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?id=7e63420847ae5f1036e4f7c42f0b3282e73efbc2#n183
Why was a colon misplaced here?
Regards,
Markus
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] iio: adc: ad7192: fix null de-ref crash during probe
2020-04-06 19:46 [PATCH] iio: adc: ad7192: fix null de-ref crash during probe Markus Elfring
@ 2020-04-07 4:59 ` Ardelean, Alexandru
0 siblings, 0 replies; 3+ messages in thread
From: Ardelean, Alexandru @ 2020-04-07 4:59 UTC (permalink / raw)
To: Markus.Elfring, linux-iio; +Cc: jic23, Tachici, Alexandru, linux-kernel
On Mon, 2020-04-06 at 21:46 +0200, Markus Elfring wrote:
> > After that patch 'spi_get_device_id(spi)' returns NULL, so this crashes
> > during probe with null de-ref.
>
> How do you think about to use the term “null pointer dereference”
> in the commit message?
depends how long the commit title with be
will take a look
>
>
> > Fixes 66614ab2be38: ("staging: iio: adc: ad7192: removed spi_device_id")
>
> Please correct this tag.
> https://urldefense.com/v3/__https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?id=7e63420847ae5f1036e4f7c42f0b3282e73efbc2*n183__;Iw!!A3Ni8CS0y2Y!uk9bOaD_449N0PxwtQ_WikWYY5KnpykeZTp-rbrRTju7FZM6fPd48zCD1pe7rTSYypKYkg$
>
> Why was a colon misplaced here?
will fix
thanks
>
> Regards,
> Markus
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] iio: adc: ad7192: fix null de-ref crash during probe
@ 2020-04-06 12:31 Alexandru Ardelean
0 siblings, 0 replies; 3+ messages in thread
From: Alexandru Ardelean @ 2020-04-06 12:31 UTC (permalink / raw)
To: linux-iio, linux-kernel; +Cc: jic23, alexandru.tachici, Alexandru Ardelean
When the 'spi_device_id' table was removed, it omitted to cleanup/fix the
assignment:
'indio_dev->name = spi_get_device_id(spi)->name;'
After that patch 'spi_get_device_id(spi)' returns NULL, so this crashes
during probe with null de-ref.
This change assigns the 'compatible' string from the DT table, as the new
'indio_dev->name'. As such, the new device/part name now looks like
'adi,ad719x', and now has the vendor prefix.
Note that this change is not doing any NULL check to the return value of
'of_match_device()'. This shouldn't happen, and if it does it's likely a
framework error on the probe side.
Fixes 66614ab2be38: ("staging: iio: adc: ad7192: removed spi_device_id")
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
drivers/iio/adc/ad7192.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c
index 8ec28aa8fa8a..0039a45e1f33 100644
--- a/drivers/iio/adc/ad7192.c
+++ b/drivers/iio/adc/ad7192.c
@@ -888,6 +888,7 @@ MODULE_DEVICE_TABLE(of, ad7192_of_match);
static int ad7192_probe(struct spi_device *spi)
{
+ const struct of_device_id *of_id;
struct ad7192_state *st;
struct iio_dev *indio_dev;
int ret, voltage_uv = 0;
@@ -937,10 +938,12 @@ static int ad7192_probe(struct spi_device *spi)
goto error_disable_avdd;
}
+ of_id = of_match_device(ad7192_of_match, &spi->dev);
+
spi_set_drvdata(spi, indio_dev);
- st->devid = (unsigned long)of_device_get_match_data(&spi->dev);
+ st->devid = (unsigned long)of_id->data;
indio_dev->dev.parent = &spi->dev;
- indio_dev->name = spi_get_device_id(spi)->name;
+ indio_dev->name = of_id->compatible;
indio_dev->modes = INDIO_DIRECT_MODE;
ret = ad7192_channels_config(indio_dev);
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-07 4:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-06 19:46 [PATCH] iio: adc: ad7192: fix null de-ref crash during probe Markus Elfring
2020-04-07 4:59 ` Ardelean, Alexandru
-- strict thread matches above, loose matches on Subject: below --
2020-04-06 12:31 Alexandru Ardelean
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).