From patchwork Wed Jun 9 13:24:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 12310125 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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 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 980C9C48BCD for ; Wed, 9 Jun 2021 13:24:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7CC94613BC for ; Wed, 9 Jun 2021 13:24:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236369AbhFIN0T (ORCPT ); Wed, 9 Jun 2021 09:26:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:43220 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236258AbhFIN0S (ORCPT ); Wed, 9 Jun 2021 09:26:18 -0400 Received: from oasis.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 1C0FE613B8 for ; Wed, 9 Jun 2021 13:24:24 +0000 (UTC) Date: Wed, 9 Jun 2021 09:24:22 -0400 From: Steven Rostedt To: "linux-trace-devel@vger.kernel.org" Subject: [PATCH] libtracefs: Do not free filter regex if it was not created in update_filter() Message-ID: <20210609092422.65edc8c2@oasis.local.home> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org From: "Steven Rostedt (VMware)" If the filter is NULL and reset is set in update_filter(), the filter regex is not created, in which case it must not be freed, as the call to regfree() does not handle a case of an uninitialized regex. Fixes: 8f26581f ("libtracefs: Allow filter be NULL if RESET flag is set") Signed-off-by: Steven Rostedt (VMware) --- src/tracefs-tools.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tracefs-tools.c b/src/tracefs-tools.c index 993fb3c..f202a15 100644 --- a/src/tracefs-tools.c +++ b/src/tracefs-tools.c @@ -816,7 +816,8 @@ static int update_filter(const char *filter_path, int *fd, } out_free: - regfree(&func_filter.re); + if (filter) + regfree(&func_filter.re); free_func_list(func_list); out: pthread_mutex_unlock(lock);