From 32c69e085ea87130180cd08b7cd23d5f3c5012a2 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Wed, 28 May 2025 07:11:09 +0000
Subject: [PATCH] Reapply "dm: always update the array size in realloc_argv on
 success"

This reverts commit a10c89734cdd6a0dca61cd239cb2b1b6e90ab152.

It should now be fixed so should be safe to apply again.

Change-Id: I9e96304f5118f3bf351eb5b0cb1ef9deade2d42d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---
 drivers/md/dm-table.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index bb09e2815891..3562de50098e 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -501,9 +501,10 @@ static char **realloc_argv(unsigned int *size, char **old_argv)
 		gfp = GFP_NOIO;
 	}
 	argv = kmalloc_array(new_size, sizeof(*argv), gfp);
-	if (argv && old_argv) {
-		memcpy(argv, old_argv, *size * sizeof(*argv));
+	if (argv) {
 		*size = new_size;
+		if (old_argv)
+			memcpy(argv, old_argv, *size * sizeof(*argv));
 	}
 
 	kfree(old_argv);