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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCCBEC433EF for ; Sat, 9 Jul 2022 01:03:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229544AbiGIBDt (ORCPT ); Fri, 8 Jul 2022 21:03:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229509AbiGIBDl (ORCPT ); Fri, 8 Jul 2022 21:03:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A02C52C64D; Fri, 8 Jul 2022 18:03:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7850B623EE; Sat, 9 Jul 2022 01:03:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14ACAC341CA; Sat, 9 Jul 2022 01:03:36 +0000 (UTC) Date: Fri, 8 Jul 2022 21:03:35 -0400 From: Steven Rostedt To: Zheng Yejian Cc: , , , , , Subject: Re: [PATCH] Revert "tracing: fix double free" Message-ID: <20220708210335.79a38356@gandalf.local.home> In-Reply-To: <20220630013137.164756-1-zhengyejian1@huawei.com> References: <20220630013137.164756-1-zhengyejian1@huawei.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 30 Jun 2022 09:31:37 +0800 Zheng Yejian wrote: > diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c > index 48e82e141d54..2784951e0fc8 100644 > --- a/kernel/trace/trace_events_hist.c > +++ b/kernel/trace/trace_events_hist.c > @@ -4430,6 +4430,7 @@ static int parse_var_defs(struct hist_trigger_data *hist_data) > > s = kstrdup(field_str, GFP_KERNEL); > if (!s) { > + kfree(hist_data->attrs->var_defs.name[n_vars]); Instead of doing just a revert, can we also add, for safety: hist_data->attrs->var_defs.name[n_vars] = NULL; Thanks, -- Steve > ret = -ENOMEM; > goto free; > }