]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
tools lib traceevent: Fix memory leakage in filter_event
authorHewenliang <hewenliang4@huawei.com>
Mon, 9 Dec 2019 06:35:49 +0000 (01:35 -0500)
committerKhalid Elmously <khalid.elmously@canonical.com>
Fri, 6 Mar 2020 07:13:20 +0000 (02:13 -0500)
BugLink: https://bugs.launchpad.net/bugs/1864904
[ Upstream commit f84ae29a6169318f9c929720c49d96323d2bbab9 ]

It is necessary to call free_arg(arg) when add_filter_type() returns NULL
in filter_event().

Signed-off-by: Hewenliang <hewenliang4@huawei.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Feilong Lin <linfeilong@huawei.com>
Cc: Tzvetomir Stoyanov <tstoyanov@vmware.com>
Link: http://lore.kernel.org/lkml/20191209063549.59941-1-hewenliang4@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
tools/lib/traceevent/parse-filter.c

index 293ab6e10a9f22238564504aacfe29ecc312ff04..544fe1c585e1d235ceb20759234be4219ecb66d1 100644 (file)
@@ -1244,8 +1244,10 @@ filter_event(struct event_filter *filter, struct event_format *event,
        }
 
        filter_type = add_filter_type(filter, event->id);
-       if (filter_type == NULL)
+       if (filter_type == NULL) {
+               free_arg(arg);
                return PEVENT_ERRNO__MEM_ALLOC_FAILED;
+       }
 
        if (filter_type->filter)
                free_arg(filter_type->filter);