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 786F91BDC3; Mon, 14 Oct 2024 14:59:08 +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=1728917948; cv=none; b=uQsNgxlULaBV4O04WK+1iNwEQfE/9T3iOK9ooITtT97qhdOwsWpakYFguP0CgPvsi6L4jC9mbqgCdMitBcNkftdqzSjWPcOPdPh63RGo8JZ/kwn0xrXWc/qmdXyHhj3k5pm97npeXXiVkozv0NqpcMfsm9Q97LlIiyphmhP3plI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728917948; c=relaxed/simple; bh=KnK+eB7F9Q4I7MuqdIBC3IGRVVaYCW5pzJNIPflOKIk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jPrm/wIOkgcGao8xkiWuWr38DLc5aKjKLavjhXKxN88ao9LOPfbncF5Wh6rnQyFB1F+Q0sK+UlGqTxBE05XMHUvQKudimPRiYt3HFMnYwsRRRQzQRbdm82Y28sBQfOAksG0MhRLweU7fwK/KE7uH3aj4lldapmYcunPBnPJCPc8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=q0kMtx3d; 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="q0kMtx3d" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1786C4CEC3; Mon, 14 Oct 2024 14:59:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728917948; bh=KnK+eB7F9Q4I7MuqdIBC3IGRVVaYCW5pzJNIPflOKIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q0kMtx3dKangQZx5cqBPzFov02tjJ/ypQCe5cmVd7psU9epnpWKX1YdEjIRlRDnov Oe1XHm5i6GX6PMhQ5Uh/EjA691fAddk8nwxAdST5X+d+AL4C2mCfvN9LIPg7i3x3mC h5DbBWwAtMgEf6kdtOpABLvH+MI0uJ4c81tb4Syg= 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.1 179/798] perf sched timehist: Fix missing free of session in perf_sched__timehist() Date: Mon, 14 Oct 2024 16:12:13 +0200 Message-ID: <20241014141224.959009826@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141217.941104064@linuxfoundation.org> References: <20241014141217.941104064@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-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 f93737eef07ba..22d781c1acd43 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -3056,7 +3056,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