]> git.itanic.dy.fi Git - linux-stable/commitdiff
perf tools: Avoid warning in do_realloc_array_as_needed()
authorAdrian Hunter <adrian.hunter@intel.com>
Thu, 16 Mar 2023 19:41:56 +0000 (21:41 +0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 4 Apr 2023 12:39:56 +0000 (09:39 -0300)
do_realloc_array_as_needed() used memcpy() of zero size with a NULL
pointer. Check the size first to avoid sanitize warning.

Discovered using EXTRA_CFLAGS="-fsanitize=undefined -fsanitize=address".

Reported-by: kernel test robot <yujie.liu@intel.com>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/oe-lkp/202303061424.6ad43294-yujie.liu@intel.com
Link: https://lore.kernel.org/r/20230316194156.8320-2-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/util.c

index b356c9f7f0c3a40bbc7c6096183fc2dc9e0486fa..089208b51e68bcf208c33f98881955fd7e935e09 100644 (file)
@@ -524,7 +524,8 @@ int do_realloc_array_as_needed(void **arr, size_t *arr_sz, size_t x, size_t msz,
        new_arr = calloc(new_sz, msz);
        if (!new_arr)
                return -ENOMEM;
-       memcpy(new_arr, *arr, *arr_sz * msz);
+       if (*arr_sz)
+               memcpy(new_arr, *arr, *arr_sz * msz);
        if (init_val) {
                for (i = *arr_sz; i < new_sz; i++)
                        memcpy(new_arr + (i * msz), init_val, msz);