From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48CD1C04AB6 for ; Tue, 28 May 2019 14:44:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 282C0214D8 for ; Tue, 28 May 2019 14:44:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727170AbfE1OoD (ORCPT ); Tue, 28 May 2019 10:44:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:37436 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726720AbfE1OoC (ORCPT ); Tue, 28 May 2019 10:44:02 -0400 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0E12820679; Tue, 28 May 2019 14:44:01 +0000 (UTC) Date: Tue, 28 May 2019 10:44:00 -0400 From: Steven Rostedt To: Tomas Bortoli Cc: mingo@redhat.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH] trace: Avoid memory leak in predicate_parse() Message-ID: <20190528104400.388e4c3f@gandalf.local.home> In-Reply-To: <20190528134659.4041-1-tomasbortoli@gmail.com> References: <20190528134659.4041-1-tomasbortoli@gmail.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 28 May 2019 15:46:59 +0200 Tomas Bortoli wrote: > In case of errors, predicate_parse() goes to the out_free label > to free memory and to return an error code. > > However, predicate_parse() does not free the predicates of the > temporary prog_stack array, thence leaking them. > > > Signed-off-by: Tomas Bortoli > Reported-by: syzbot+6b8e0fb820e570c59e19@syzkaller.appspotmail.com > --- > kernel/trace/trace_events_filter.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c > index d3e59312ef40..98eafad750d3 100644 > --- a/kernel/trace/trace_events_filter.c > +++ b/kernel/trace/trace_events_filter.c > @@ -433,6 +433,8 @@ predicate_parse(const char *str, int nr_parens, int nr_preds, > parse_error(pe, -ENOMEM, 0); > goto out_free; > } > + memset(prog_stack, 0, nr_preds * sizeof(*prog_stack)); > + Can you instead just switch the allocation of prog_stack to use kcalloc()? Thanks, -- Steve > inverts = kmalloc_array(nr_preds, sizeof(*inverts), GFP_KERNEL); > if (!inverts) { > parse_error(pe, -ENOMEM, 0); > @@ -579,6 +581,8 @@ predicate_parse(const char *str, int nr_parens, int nr_preds, > out_free: > kfree(op_stack); > kfree(inverts); > + for (i = 0; prog_stack[i].pred; i++) > + kfree(prog_stack[i].pred); > kfree(prog_stack); > return ERR_PTR(ret); > }