From a10c89734cdd6a0dca61cd239cb2b1b6e90ab152 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 21 May 2025 15:18:37 +0000 Subject: [PATCH] Revert "dm: always update the array size in realloc_argv on success" This reverts commit 64e95bb37916ab03dcb7a920276c5a52df8e568b which is commit 5a2a6c428190f945c5cbf5791f72dbea83e97f66 upstream. It breaks the Android kernel testing and can be brought back in the future in an safe way if it is really needed. Bug: 161946584 Change-Id: Ie1931ea6687fa16b4575e4d44c5910a871f9b0de Signed-off-by: Greg Kroah-Hartman --- drivers/md/dm-table.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 3562de50098e..bb09e2815891 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -501,10 +501,9 @@ static char **realloc_argv(unsigned int *size, char **old_argv) gfp = GFP_NOIO; } argv = kmalloc_array(new_size, sizeof(*argv), gfp); - if (argv) { + if (argv && old_argv) { + memcpy(argv, old_argv, *size * sizeof(*argv)); *size = new_size; - if (old_argv) - memcpy(argv, old_argv, *size * sizeof(*argv)); } kfree(old_argv);