From: Yunfeng Ye <yeyunfeng@huawei.com>

Date: Wed, 16 Oct 2019 21:50:17 +0800

Subject: perf jevents: Fix resource leak in process_mapfile() and main()

Git-commit: 1785fbb73896dbd9d27a406f0d73047df42db710

Patch-mainline: v5.5-rc1

References: git-fixes

​

There are memory leaks and file descriptor resource leaks in

process_mapfile() and main().

​

Fix this by adding free(), fclose() and free_arch_std_events() on the

error paths.

​

Fixes: 80eeb67fe577 ("perf jevents: Program to convert JSON file")

Fixes: 3f056b66647b ("perf jevents: Make build fail on JSON parse error")

Fixes: e9d32c1bf0cd ("perf vendor events: Add support for arch standard events")

Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>

Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>

Cc: Andi Kleen <ak@linux.intel.com>

Cc: Feilong Lin <linfeilong@huawei.com>

Cc: Hu Shiyuan <hushiyuan@huawei.com>

Cc: Jiri Olsa <jolsa@redhat.com>

Cc: John Garry <john.garry@huawei.com>

Cc: Kan Liang <kan.liang@linux.intel.com>

Cc: Luke Mujica <lukemujica@google.com>

Cc: Mark Rutland <mark.rutland@arm.com>

Cc: Namhyung Kim <namhyung@kernel.org>

Cc: Peter Zijlstra <peterz@infradead.org>

Cc: Zenghui Yu <yuzenghui@huawei.com>

Link: http://lore.kernel.org/lkml/d7907042-ec9c-2bef-25b4-810e14602f89@huawei.com

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Signed-off-by: Tony Jones <tonyj@suse.de>

---

 tools/perf/pmu-events/jevents.c | 13 +++++++++++--

 1 file changed, 11 insertions(+), 2 deletions(-)

​

diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c

index 7d69727f44bd..079c77b6a2fd 100644

--- a/tools/perf/pmu-events/jevents.c

+++ b/tools/perf/pmu-events/jevents.c

@@ -772,6 +772,7 @@ static int process_mapfile(FILE *outfp, char *fpath)

    char *line, *p;

    int line_num;

    char *tblname;

+   int ret = 0;

    pr_info("%s: Processing mapfile %s\n", prog, fpath);

@@ -783,6 +784,7 @@ static int process_mapfile(FILE *outfp, char *fpath)

    if (!mapfp) {

        pr_info("%s: Error %s opening %s\n", prog, strerror(errno),

                fpath);

+       free(line);

        return -1;

    }

@@ -809,7 +811,8 @@ static int process_mapfile(FILE *outfp, char *fpath)

            /* TODO Deal with lines longer than 16K */

            pr_info("%s: Mapfile %s: line %d too long, aborting\n",

                    prog, fpath, line_num);

-           return -1;

+           ret = -1;

+           goto out;

        }

        line[strlen(line)-1] = '\0';

@@ -839,7 +842,9 @@ static int process_mapfile(FILE *outfp, char *fpath)

 out:

    print_mapping_table_suffix(outfp);

-   return 0;

+   fclose(mapfp);

+   free(line);

+   return ret;

 }

 /*

@@ -1136,6 +1141,7 @@ int main(int argc, char *argv[])

        goto empty_map;

    } else if (rc < 0) {

        /* Make build fail */

+       fclose(eventsfp);

        free_arch_std_events();

        return 1;

    } else if (rc) {

@@ -1148,6 +1154,7 @@ int main(int argc, char *argv[])

        goto empty_map;

    } else if (rc < 0) {

        /* Make build fail */

+       fclose(eventsfp);

        free_arch_std_events();

        return 1;

    } else if (rc) {

@@ -1165,6 +1172,8 @@ int main(int argc, char *argv[])

    if (process_mapfile(eventsfp, mapfile)) {

        pr_info("%s: Error processing mapfile %s\n", prog, mapfile);

        /* Make build fail */

+       fclose(eventsfp);

+       free_arch_std_events();

        return 1;

    }

​

​