iio: core: Fix and cleanup to iio_device_alloc()
cover iio: core: Fix and cleanup to iio_device_alloc()
This is an exctract of the two patches from
https://lore.kernel.org/r/[email protected]
In v1 (extract):
- removed unneeded 'else' branch (David)
- fixed typo in allocation cleanup (David)
Andy Shevchenko (2):
iio: core: Leave private pointer NULL when no private data supplied
iio: core: Calculate alloc_size only once in iio_device_alloc()
drivers/iio/industrialio-core.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
PATCH 1/2 iio: core: Leave private pointer NULL when no private data supplied
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.
--- drivers/iio/industrialio-core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/iio/industrialio-core.c +4 -2
@@ -1654,8 +1654,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;
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
Re: [PATCH v1 1/2] iio: core: Leave private pointer NULL when no private data supplied
Quoted 8 lines · Andy Shevchenko
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 <[email protected]>---
Jonathan Cameron
maintainerRe: [PATCH v1 1/2] iio: core: Leave private pointer NULL when no private data supplied
In reply to Andy ShevchenkoQuoted 6 lines · On Mon, 4 Mar 2024 16:04:32 +0200 Andy Shevchenko…
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 <[email protected]>
Fix is a strong word given any driver trying to access the pointer in this case will be broken anyway. I don't mind it being backported as it'll make bugs easier to identify but I'm not rushing it in.
Otherwise seems like a sensible bit of tidying up.
Jonathan
Quoted 21 lines
--- drivers/iio/industrialio-core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/iio/industrialio-core.c +4
-2@@ -1654,8 +1654,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;
PATCH 2/2 iio: core: Calculate alloc_size only once in iio_device_alloc()
In reply to Andy ShevchenkoNo need to rewrite the value, instead use 'else' branch. This will also help further refactoring the code later on.
--- drivers/iio/industrialio-core.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/iio/industrialio-core.c +4 -5
@@ -1643,11 +1643,10 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv)struct iio_dev *indio_dev;size_t alloc_size; - alloc_size =sizeof (struct iio_dev_opaque ); -if (sizeof_priv) { - alloc_size =ALIGN (alloc_size,IIO_DMA_MINALIGN ); - alloc_size += sizeof_priv; - } +if (sizeof_priv) + alloc_size =ALIGN (sizeof (*iio_dev_opaque),IIO_DMA_MINALIGN ) + sizeof_priv; +else + alloc_size =sizeof (*iio_dev_opaque); iio_dev_opaque =kzalloc (alloc_size,GFP_KERNEL );if (!iio_dev_opaque)
Signature · 1 line
2.43.0.rc1.1.gbec44491f096
Re: [PATCH v1 2/2] iio: core: Calculate alloc_size only once in iio_device_alloc()
Quoted 6 lines · Andy Shevchenko
No need to rewrite the value, instead use 'else' branch. This will also help further refactoring the code later on.
Signed-off-by Andy Shevchenko <[email protected]>---
Re: [PATCH v1 2/2] iio: core: Calculate alloc_size only once in iio_device_alloc()
In reply to Andy ShevchenkoLe 04/03/2024 à 15:04, Andy Shevchenko a écrit :
Quoted 13 lines
No need to rewrite the value, instead use 'else' branch. This will also help further refactoring the code later on.
--- drivers/iio/industrialio-core.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)drivers/iio/industrialio-core.c +0
-0
drivers/iio/industrialio-core.c struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv) · line 1647
Quoted 10 lines
drivers/iio/industrialio-core.c +2
-5@@ -1643,11 +1643,10 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv)struct iio_dev *indio_dev;size_t alloc_size; - alloc_size =sizeof (struct iio_dev_opaque ); -if (sizeof_priv) { - alloc_size =ALIGN (alloc_size,IIO_DMA_MINALIGN ); - alloc_size += sizeof_priv; - } +if (sizeof_priv) + alloc_size =ALIGN (sizeof (*iio_dev_opaque),IIO_DMA_MINALIGN ) + sizeof_priv;
maybe size_add() to be super-safe?
CJ
Quoted 5 lines
drivers/iio/industrialio-core.c +2
-0+else + alloc_size =sizeof (*iio_dev_opaque); iio_dev_opaque =kzalloc (alloc_size,GFP_KERNEL );if (!iio_dev_opaque)
Quoted 7 lines · On Mon, 4 Mar 2024 16:04:31 +0200 Andy Shevchenko…
This is an exctract of the two patches from
https://lore.kernel.org/r/[email protected]In v1 (extract):
- removed unneeded 'else' branch (David)
- fixed typo in allocation cleanup (David)
Quoted 7 lines
Andy Shevchenko (2):
iio: core: Leave private pointer NULL when no private data supplied
iio: core: Calculatealloc_sizeonly once iniio_device_alloc()drivers/iio/industrialio-core.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
Applied to the togreg-normal branch of iio.git which I'll rebase on rc1 once available and push out as togreg.
Thanks,
Jonathan