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 7D8C31519AA; Wed, 5 Feb 2025 14:05:06 +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=1738764306; cv=none; b=C94FH+OiaR5CaDjBnfB7P6XYSdGw95mDJq0B5sNru+bk1/EYjFe5pBvc9LOkITBLpXNIP+SbHFanpKfdzGNIIEgQVB22p9MxNynuNpG+AnjY8Fif3YMmjfZkKzNjXUL6PgZeAaT8tyQH/NShBTQ2KVvaGlYRREq4HkVFJbiHLl0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738764306; c=relaxed/simple; bh=2BSiI916WVdnhqxbhW3ws6QBYLCYRBJ95b5jWBJegY4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PBo2Pt0OEr65aZ7l3Ryi+Vc1timRBg0xV8MU5iaIWbE1RyRhQNk4vMaHDEihvcQCFo5nGMm4YCSYq+fhfggdDu6dD7zakdhHaf3to1+kyoDVsbrPjmp6pk0a1qqc4hltnDuZX41rS3bl654AkcxrwapQfr8lyYNeZW0CykQFlVA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1AHDmLqS; 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="1AHDmLqS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C382BC4CED1; Wed, 5 Feb 2025 14:05:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738764306; bh=2BSiI916WVdnhqxbhW3ws6QBYLCYRBJ95b5jWBJegY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1AHDmLqSdbJIVxhPqnzAnX+tTyDxzQrVUu4A5GrqOYlCpl63R08LS6XNlzpf+IBMC lhYVqd/fBAxJWguoxQ08jIvEGOBWCZNLpB2rrLhx60jmm75F/ErB5AVDQ+w6lvhO7P DuMxBIp+yLKam68Cigd96IQ1vVECXA+DZSGR1yzc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Namhyung Kim , Zhongqiu Han , Adrian Hunter , Alexander Shishkin , Ian Rogers , Ingo Molnar , James Clark , Jiri Olsa , Kan Liang , Mark Rutland , Peter Zijlstra , Song Liu , Yicong Yang , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.6 160/393] perf header: Fix one memory leakage in process_bpf_btf() Date: Wed, 5 Feb 2025 14:41:19 +0100 Message-ID: <20250205134426.423894135@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134420.279368572@linuxfoundation.org> References: <20250205134420.279368572@linuxfoundation.org> User-Agent: quilt/0.68 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhongqiu Han [ Upstream commit 875d22980a062521beed7b5df71fb13a1af15d83 ] If __perf_env__insert_btf() returns false due to a duplicate btf node insertion, the temporary node will leak. Add a check to ensure the memory is freed if the function returns false. Fixes: a70a1123174ab592 ("perf bpf: Save BTF information as headers to perf.data") Reviewed-by: Namhyung Kim Signed-off-by: Zhongqiu Han Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Ian Rogers Cc: Ingo Molnar Cc: James Clark Cc: Jiri Olsa Cc: Kan Liang Cc: Mark Rutland Cc: Peter Zijlstra Cc: Song Liu Cc: Yicong Yang Link: https://lore.kernel.org/r/20241205084500.823660-2-quic_zhonhan@quicinc.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/header.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 1482567e5ac1a..34d3b567ae772 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -3224,7 +3224,8 @@ static int process_bpf_btf(struct feat_fd *ff, void *data __maybe_unused) if (__do_read(ff, node->data, data_size)) goto out; - __perf_env__insert_btf(env, node); + if (!__perf_env__insert_btf(env, node)) + free(node); node = NULL; } -- 2.39.5