From patchwork Tue Sep 29 11:01:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 263030 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=-10.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 50E94C4727F for ; Tue, 29 Sep 2020 12:19:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 118312075F for ; Tue, 29 Sep 2020 12:19:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601381979; bh=8Xl8krSWWjEbrwwGCe4nJUW2lkhY6aYa4LRvisEmmVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PKCtAJYpVW0Hr5q4VIBZmOh4b2RGBLNEdQBDI1zIMpl+mifCjTvc+0UKykFJ3fjUQ D3HQTpXYuJWztC44epu5nEOYjQ1vi6XYkFLpWd+nMO7agF+cVM2c5IaWgvphg7CqGB oJ8MGV2msuLucuHji33fVGFlCsbIx2eL662oMFdA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732304AbgI2MTU (ORCPT ); Tue, 29 Sep 2020 08:19:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:54450 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728715AbgI2LgJ (ORCPT ); Tue, 29 Sep 2020 07:36:09 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 3A06123DB4; Tue, 29 Sep 2020 11:31:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379063; bh=8Xl8krSWWjEbrwwGCe4nJUW2lkhY6aYa4LRvisEmmVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bse+2iFkyAA3TK2/ldAkU7eUXC5cJG5lyzhXAm+pQgz0p4vFNFLqQyKZQJ0RTLfFl fW7/nTyQfsVDuGJBB2QNg3SQIh0d39qNyncDuIM2Zh65LUWYKqFPQwmGman/dcZ4Lo ILrllFwFSQlx0xKmjRN8/RQFlWLDouf5GSrmlXic= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tom Zanussi , Tom Rix , "Steven Rostedt (VMware)" Subject: [PATCH 4.19 236/245] tracing: fix double free Date: Tue, 29 Sep 2020 13:01:27 +0200 Message-Id: <20200929105958.475612277@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105946.978650816@linuxfoundation.org> References: <20200929105946.978650816@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tom Rix commit 46bbe5c671e06f070428b9be142cc4ee5cedebac upstream. clang static analyzer reports this problem trace_events_hist.c:3824:3: warning: Attempt to free released memory kfree(hist_data->attrs->var_defs.name[i]); In parse_var_defs() if there is a problem allocating var_defs.expr, the earlier var_defs.name is freed. This free is duplicated by free_var_defs() which frees the rest of the list. Because free_var_defs() has to run anyway, remove the second free fom parse_var_defs(). Link: https://lkml.kernel.org/r/20200907135845.15804-1-trix@redhat.com Cc: stable@vger.kernel.org Fixes: 30350d65ac56 ("tracing: Add variable support to hist triggers") Reviewed-by: Tom Zanussi Signed-off-by: Tom Rix Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace_events_hist.c | 1 - 1 file changed, 1 deletion(-) --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -4225,7 +4225,6 @@ static int parse_var_defs(struct hist_tr s = kstrdup(field_str, GFP_KERNEL); if (!s) { - kfree(hist_data->attrs->var_defs.name[n_vars]); ret = -ENOMEM; goto free; }