Revert "dm: always update the array size in realloc_argv on success"
This reverts commit 64e95bb379
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 <gregkh@google.com>
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user