From nobody Mon Sep 29 21:08:03 2025 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 E6EF6C3F6B0 for ; Tue, 16 Aug 2022 04:46:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232031AbiHPEql (ORCPT ); Tue, 16 Aug 2022 00:46:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232021AbiHPEms (ORCPT ); Tue, 16 Aug 2022 00:42:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E76CABD6D; Mon, 15 Aug 2022 13:37:52 -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 35F13611FC; Mon, 15 Aug 2022 20:37:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 293E0C43470; Mon, 15 Aug 2022 20:37:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660595871; bh=WMHuwJF65OUTic2MXusj7pI//kwnDmHogdmjBJcNqpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MsOnGz4K64V/czgj9Dd1ZQUsq5FI5cDWZQRNI4yrpR8KxHm+sdYlMLsLC30RpwFez u0rIySwjhIbEdri2GPCSUKDNbm7fbfQSVp0JaW62ndlzvO8g8kAB/y+ntxtQCh+UOJ joDhOGyfDTwjDsWzoQxxhcthSVx6ItsW11J7I7y8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Schwab , Daniel Bristot de Oliveira , "Steven Rostedt (Google)" , Sasha Levin Subject: [PATCH 5.19 0869/1157] rtla: Fix double free Date: Mon, 15 Aug 2022 20:03:45 +0200 Message-Id: <20220815180514.237489066@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Andreas Schwab [ Upstream commit 4f753c3be52c1d930afc0fe3169baa605dbaf611 ] Avoid double free by making trace_instance_destroy indempotent. When trace_instance_init fails, it calls trace_instance_destroy, but its only caller osnoise_destroy_tool calls it again. Link: https://lkml.kernel.org/r/mvmilnlkyzx.fsf_-_@suse.de Fixes: 0605bf009f18 ("rtla: Add osnoise tool") Signed-off-by: Andreas Schwab Acked-by: Daniel Bristot de Oliveira Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- tools/tracing/rtla/src/trace.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/tracing/rtla/src/trace.c b/tools/tracing/rtla/src/trace.c index 5784c9f9e570..e1ba6d9f4265 100644 --- a/tools/tracing/rtla/src/trace.c +++ b/tools/tracing/rtla/src/trace.c @@ -134,13 +134,18 @@ void trace_instance_destroy(struct trace_instance *tr= ace) if (trace->inst) { disable_tracer(trace->inst); destroy_instance(trace->inst); + trace->inst =3D NULL; } =20 - if (trace->seq) + if (trace->seq) { free(trace->seq); + trace->seq =3D NULL; + } =20 - if (trace->tep) + if (trace->tep) { tep_free(trace->tep); + trace->tep =3D NULL; + } } =20 /* --=20 2.35.1