diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2024-03-04 16:04:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-12 11:12:13 +0200 |
| commit | fe92a949b26400c7f3f2ea53310fd378e57b99ca (patch) | |
| tree | b2de479d1798831faa075ac9f68a75e2aa1aa456 /drivers/iio | |
| parent | 5c53a28ab253d28853ee3b9b713f9f872b67c2d4 (diff) | |
| download | linux-fe92a949b26400c7f3f2ea53310fd378e57b99ca.tar.gz linux-fe92a949b26400c7f3f2ea53310fd378e57b99ca.tar.bz2 linux-fe92a949b26400c7f3f2ea53310fd378e57b99ca.zip | |
iio: core: Leave private pointer NULL when no private data supplied
[ Upstream commit f0245ab389330cbc1d187e358a5b890d9f5383db ]
In iio_device_alloc() when size of the private data is 0,
the private pointer is calculated to point behind the valid data.
Leave it NULL when no private data supplied.
Fixes: 6d4ebd565d15 ("iio: core: wrap IIO device into an iio_dev_opaque object")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Link: https://lore.kernel.org/r/20240304140650.977784-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/industrialio-core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index feec93adb065..5e1a85ca1211 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1649,8 +1649,10 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv) return NULL; indio_dev = &iio_dev_opaque->indio_dev; - indio_dev->priv = (char *)iio_dev_opaque + - ALIGN(sizeof(struct iio_dev_opaque), IIO_DMA_MINALIGN); + + if (sizeof_priv) + indio_dev->priv = (char *)iio_dev_opaque + + ALIGN(sizeof(*iio_dev_opaque), IIO_DMA_MINALIGN); indio_dev->dev.parent = parent; indio_dev->dev.type = &iio_device_type; |