• Arnaldo Carvalho de Melo's avatar
    perf bpf: Defer freeing string after possible strlen() on it · 31ded153
    Arnaldo Carvalho de Melo authored
    This was detected by the gcc in Fedora Rawhide's gcc:
    
      50    11.01 fedora:rawhide                : FAIL gcc version 12.0.1 20220205 (Red Hat 12.0.1-0) (GCC)
            inlined from 'bpf__config_obj' at util/bpf-loader.c:1242:9:
        util/bpf-loader.c:1225:34: error: pointer 'map_opt' may be used after 'free' [-Werror=use-after-free]
         1225 |                 *key_scan_pos += strlen(map_opt);
              |                                  ^~~~~~~~~~~~~~~
        util/bpf-loader.c:1223:9: note: call to 'free' here
         1223 |         free(map_name);
              |         ^~~~~~~~~~~~~~
        cc1: all warnings being treated as errors
    
    So do the calculations on the pointer before freeing it.
    
    Fixes: 04f9bf2b ("perf bpf-loader: Add missing '*' for key_scan_pos")
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Wang ShaoBo <bobo.shaobowang@huawei.com>
    Link: https://lore.kernel.org/lkml/Yg1VtQxKrPpS3uNA@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    31ded153
bpf-loader.c 40.3 KB