From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34E761D0DFE; Wed, 2 Oct 2024 14:08:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727878097; cv=none; b=YrHKQqykRt8boZw3ufLgpp62JkrZG/7MeCrl70rMTow7t4cCfoijGxojuK2x5jovRlGjpr+Uw8yYYfXPSF4pny6t06P215mDURcDz7kDD6EfEDdFrrfsV86o3svMKoe6zUMbGXIXmmy6UBSfOMP1w/nBLsDvMWbMqeXtm6JMJNk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727878097; c=relaxed/simple; bh=ZwAn01j4IRSrHoKtwd0vq5O8O6TdkfvM1EUTMY3IWGc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eH4IGu/IQVDiouXaR4E3gxkVuDknxBerPwdPncGBBn6j0iiCZkX42PUtz8rBUnc2frGxXZJOUwtn5ylSGDfpvWGTIo2XPv2yIbSdXedWKn/5zS9m80Nzhnb3vvqi764Vrd1s+XcQASLarhWfxdUjW5S2W7aGqYpF+Xad0Jlnjeo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZFO1ftR1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ZFO1ftR1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 824B5C4CEC2; Wed, 2 Oct 2024 14:08:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727878097; bh=ZwAn01j4IRSrHoKtwd0vq5O8O6TdkfvM1EUTMY3IWGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZFO1ftR1es/fi0C8DSU4x166tsr3pfX22Obu30vNcNALtNSl3Zhu3gOxQeHzqOiiP 4+AJA4utU/ihxSRsrTfzk+HoigV3AARw19wxWv3+Mmdh2/XvGhmEPmQd/oLpeb/yPL YO9eMjm44xtUvpLbPWZjEPpmvCoKtD+JGiM0jQuM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yang Jihong , Namhyung Kim , Adrian Hunter , Alexander Shishkin , David Ahern , Ian Rogers , Ingo Molnar , Jiri Olsa , Kan Liang , Mark Rutland , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.10 299/634] perf sched timehist: Fix missing free of session in perf_sched__timehist() Date: Wed, 2 Oct 2024 14:56:39 +0200 Message-ID: <20241002125822.912022037@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125811.070689334@linuxfoundation.org> References: <20241002125811.070689334@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yang Jihong [ Upstream commit 6bdf5168b6fb19541b0c1862bdaa596d116c7bfb ] When perf_time__parse_str() fails in perf_sched__timehist(), need to free session that was previously created, fix it. Fixes: 853b74071110bed3 ("perf sched timehist: Add option to specify time window of interest") Signed-off-by: Yang Jihong Acked-by: Namhyung Kim Cc: Adrian Hunter Cc: Alexander Shishkin Cc: David Ahern Cc: Ian Rogers Cc: Ingo Molnar Cc: Jiri Olsa Cc: Kan Liang Cc: Mark Rutland Cc: Peter Zijlstra Link: https://lore.kernel.org/r/20240806023533.1316348-1-yangjihong@bytedance.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/builtin-sched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 5977c49ae2c76..bb173de716578 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -3031,7 +3031,8 @@ static int perf_sched__timehist(struct perf_sched *sched) if (perf_time__parse_str(&sched->ptime, sched->time_str) != 0) { pr_err("Invalid time string\n"); - return -EINVAL; + err = -EINVAL; + goto out; } if (timehist_check_attr(sched, evlist) != 0) -- 2.43.0