perf c2c: Prevent potential memory leak in c2c_he_zalloc()
authorShang XiaoJing <shangxiaojing@huawei.com>
Tue, 6 Sep 2022 03:29:06 +0000 (11:29 +0800)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 6 Sep 2022 12:45:23 +0000 (09:45 -0300)
Free allocated resources when zalloc() fails for members in c2c_he, to
prevent potential memory leak in c2c_he_zalloc().

Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
Reviewed-by: Leo Yan <leo.yan@linaro.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20220906032906.21395-4-shangxiaojing@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/builtin-c2c.c

index 653e13b5037ec074fa4e51a0df367b64c6d40ae5..438fc222e2138d81041a4fbe592d0e00d67aa411 100644 (file)
@@ -146,15 +146,15 @@ static void *c2c_he_zalloc(size_t size)
 
        c2c_he->cpuset = bitmap_zalloc(c2c.cpus_cnt);
        if (!c2c_he->cpuset)
-               return NULL;
+               goto out_free;
 
        c2c_he->nodeset = bitmap_zalloc(c2c.nodes_cnt);
        if (!c2c_he->nodeset)
-               return NULL;
+               goto out_free;
 
        c2c_he->node_stats = zalloc(c2c.nodes_cnt * sizeof(*c2c_he->node_stats));
        if (!c2c_he->node_stats)
-               return NULL;
+               goto out_free;
 
        init_stats(&c2c_he->cstats.lcl_hitm);
        init_stats(&c2c_he->cstats.rmt_hitm);
@@ -163,6 +163,12 @@ static void *c2c_he_zalloc(size_t size)
        init_stats(&c2c_he->cstats.load);
 
        return &c2c_he->he;
+
+out_free:
+       free(c2c_he->nodeset);
+       free(c2c_he->cpuset);
+       free(c2c_he);
+       return NULL;
 }
 
 static void c2c_he_free(void *he)