On Tue, May 09, 2023 at 10:49:38AM +0100, James Clark wrote:
> There is no krealloc_array equivalent in devres. Users would have to
> do their own multiplication overflow check so provide one.
>
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> Signed-off-by: James Clark <james.clark@xxxxxxx>
> ---
> Documentation/driver-api/driver-model/devres.rst | 1 +
> include/linux/device.h | 11 +++++++++++
> 2 files changed, 12 insertions(+)
>
> diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst
> index 4249eb4239e0..8be086b3f829 100644
> --- a/Documentation/driver-api/driver-model/devres.rst
> +++ b/Documentation/driver-api/driver-model/devres.rst
> @@ -364,6 +364,7 @@ MEM
> devm_kmalloc_array()
> devm_kmemdup()
> devm_krealloc()
> + devm_krealloc_array()
> devm_kstrdup()
> devm_kstrdup_const()
> devm_kvasprintf()
> diff --git a/include/linux/device.h b/include/linux/device.h
> index 472dd24d4823..58f4f5948edb 100644
> --- a/include/linux/device.h
> +++ b/include/linux/device.h
> @@ -223,6 +223,17 @@ static inline void *devm_kcalloc(struct device *dev,
> {
> return devm_kmalloc_array(dev, n, size, flags | __GFP_ZERO);
> }
> +static inline __realloc_size(3, 4) void * __must_check
Shouldn't you have a blank line before this one?
> +devm_krealloc_array(struct device *dev, void *p, size_t new_n, size_t new_size, gfp_t flags)
> +{
> + size_t bytes;
> +
> + if (unlikely(check_mul_overflow(new_n, new_size, &bytes)))
> + return NULL;
> +
> + return devm_krealloc(dev, p, bytes, flags);
> +}
I dislike how we have to keep copying the "real" functions (i.e.
krealloc_array) into something like this, but I can't think of a better
way to do it.
thanks,
greg k-h
