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 E642BC7EE21 for ; Thu, 4 May 2023 19:58:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231887AbjEDT6d (ORCPT ); Thu, 4 May 2023 15:58:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232507AbjEDT4L (ORCPT ); Thu, 4 May 2023 15:56:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDB101CFFE; Thu, 4 May 2023 12:49:27 -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 7AAB56380F; Thu, 4 May 2023 19:49:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21DB9C433EF; Thu, 4 May 2023 19:49:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683229748; bh=gWcA2/j5JZGlFbqhbj+OujreXgVjsxiQubZ1yW1+vQY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=msRSXQG4FgEoMA5lCNhbVxG4M9l/rUs5igqlKad4HWEj+sdB3zxeJ0592Bk51pkft YZwuPkGzxlt95r5pSG4aUcNeVXHQhqD930M9DulzpOB5Z9Aks24GHhYsfx8lCiaF+M Itlf0l9lDYr8gKH5UhWWNEaScS2po1qlr1SsvgF2i2j1zQSHzCq5RctDsyd2mBsqZV OHmNYt1BPtY09ElMrmsIBTlBtUqdwuSppvbXeLiqpdPyrbnPgNGNtIrosKyW3Fq5jC Gd5B5A/H9NuuqPuIkFOTrCP3w1oKTMsp4G8Azi3bkCvpQMzBELJK3ZwCPv5tj6ONwG 3wUB0sPFfhrDA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hao Zeng , Daniel Borkmann , Sasha Levin , ast@kernel.org, andrii@kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 19/30] samples/bpf: Fix fout leak in hbm's run_bpf_prog Date: Thu, 4 May 2023 15:48:12 -0400 Message-Id: <20230504194824.3808028-19-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230504194824.3808028-1-sashal@kernel.org> References: <20230504194824.3808028-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hao Zeng [ Upstream commit 23acb14af1914010dd0aae1bbb7fab28bf518b8e ] Fix fout being fopen'ed but then not subsequently fclose'd. In the affected branch, fout is otherwise going out of scope. Signed-off-by: Hao Zeng Signed-off-by: Daniel Borkmann Link: https://lore.kernel.org/bpf/20230411084349.1999628-1-zenghao@kylinos.cn Signed-off-by: Sasha Levin --- samples/bpf/hbm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/bpf/hbm.c b/samples/bpf/hbm.c index b0c18efe7928e..a271099603feb 100644 --- a/samples/bpf/hbm.c +++ b/samples/bpf/hbm.c @@ -308,6 +308,7 @@ static int run_bpf_prog(char *prog, int cg_id) fout = fopen(fname, "w"); fprintf(fout, "id:%d\n", cg_id); fprintf(fout, "ERROR: Could not lookup queue_stats\n"); + fclose(fout); } else if (stats_flag && qstats.lastPacketTime > qstats.firstPacketTime) { long long delta_us = (qstats.lastPacketTime - -- 2.39.2