From 55021e7533bc55100f8ae0125aec513885cc5987 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Thu, 11 Jan 2024 18:07:03 -0800 Subject: [PATCH] libxfs: fix krealloc to allow freeing data A recent refactoring to xfs_idata_realloc in the kernel made it depend on krealloc returning NULL if the new size is zero. The xfsprogs wrapper instead aborts, so we need to make it follow the kernel behavior. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Reviewed-by: Carlos Maiolino --- libxfs/kmem.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libxfs/kmem.c b/libxfs/kmem.c index 42d813088..c264be018 100644 --- a/libxfs/kmem.c +++ b/libxfs/kmem.c @@ -98,6 +98,16 @@ kmem_zalloc(size_t size, int flags) void * krealloc(void *ptr, size_t new_size, int flags) { + /* + * If @new_size is zero, Linux krealloc will free the memory and return + * NULL, so force that behavior here. The return value of realloc with + * a zero size is implementation dependent, so we cannot use that. + */ + if (!new_size) { + free(ptr); + return NULL; + } + ptr = realloc(ptr, new_size); if (ptr == NULL) { fprintf(stderr, _("%s: realloc failed (%d bytes): %s\n"), -- 2.39.5