From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Yuntao Wang <ytcoode@gmail.com>,
Andrii Nakryiko <andrii@kernel.org>,
Sasha Levin <sashal@kernel.org>,
shuah@kernel.org, ast@kernel.org, daniel@iogearbox.net,
linux-kselftest@vger.kernel.org, netdev@vger.kernel.org,
bpf@vger.kernel.org
Subject: [PATCH AUTOSEL 5.18 009/159] selftests/bpf: Fix file descriptor leak in load_kallsyms()
Date: Mon, 30 May 2022 09:21:54 -0400 [thread overview]
Message-ID: <20220530132425.1929512-9-sashal@kernel.org> (raw)
In-Reply-To: <20220530132425.1929512-1-sashal@kernel.org>
From: Yuntao Wang <ytcoode@gmail.com>
[ Upstream commit 2d0df01974ce2b59b6f7d5bd3ea58d74f12ddf85 ]
Currently, if sym_cnt > 0, it just returns and does not close file, fix it.
Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220405145711.49543-1-ytcoode@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
tools/testing/selftests/bpf/trace_helpers.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/selftests/bpf/trace_helpers.c
index 3d6217e3aff7..9c4be2cdb21a 100644
--- a/tools/testing/selftests/bpf/trace_helpers.c
+++ b/tools/testing/selftests/bpf/trace_helpers.c
@@ -25,15 +25,12 @@ static int ksym_cmp(const void *p1, const void *p2)
int load_kallsyms(void)
{
- FILE *f = fopen("/proc/kallsyms", "r");
+ FILE *f;
char func[256], buf[256];
char symbol;
void *addr;
int i = 0;
- if (!f)
- return -ENOENT;
-
/*
* This is called/used from multiplace places,
* load symbols just once.
@@ -41,6 +38,10 @@ int load_kallsyms(void)
if (sym_cnt)
return 0;
+ f = fopen("/proc/kallsyms", "r");
+ if (!f)
+ return -ENOENT;
+
while (fgets(buf, sizeof(buf), f)) {
if (sscanf(buf, "%p %c %s", &addr, &symbol, func) != 3)
break;
--
2.35.1
next prev parent reply other threads:[~2022-05-30 13:25 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220530132425.1929512-1-sashal@kernel.org>
2022-05-30 13:21 ` [PATCH AUTOSEL 5.18 004/159] ath11k: fix the warning of dev_wake in mhi_pm_disable_transition() Sasha Levin
2022-05-30 13:21 ` [PATCH AUTOSEL 5.18 006/159] selftests/bpf: Fix vfs_link kprobe definition Sasha Levin
2022-05-30 13:21 ` [PATCH AUTOSEL 5.18 007/159] selftests/bpf: Fix parsing of prog types in UAPI hdr for bpftool sync Sasha Levin
2022-05-30 13:21 ` [PATCH AUTOSEL 5.18 008/159] ath11k: Change max no of active probe SSID and BSSID to fw capability Sasha Levin
2022-05-30 13:21 ` Sasha Levin [this message]
2022-05-30 13:21 ` [PATCH AUTOSEL 5.18 010/159] rtw89: ser: fix CAM leaks occurring in L2 reset Sasha Levin
2022-05-30 13:21 ` [PATCH AUTOSEL 5.18 011/159] rtw89: fix misconfiguration on hw_scan channel time Sasha Levin
2022-05-30 13:21 ` [PATCH AUTOSEL 5.18 012/159] mwifiex: add mutex lock for call in mwifiex_dfs_chan_sw_work_queue Sasha Levin
2022-05-30 13:21 ` [PATCH AUTOSEL 5.18 013/159] b43legacy: Fix assigning negative value to unsigned variable Sasha Levin
2022-05-30 13:21 ` [PATCH AUTOSEL 5.18 014/159] b43: " Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 015/159] ipw2x00: Fix potential NULL dereference in libipw_xmit() Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 016/159] ipv6: fix locking issues with loops over idev->addr_list Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 020/159] libbpf: Fix a bug with checking bpf_probe_read_kernel() support in old kernels Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 021/159] mac80211: minstrel_ht: fix where rate stats are stored (fixes debugfs output) Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 027/159] sfc: ef10: Fix assigning negative value to unsigned variable Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 029/159] rtw88: fix incorrect frequency reported Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 030/159] rtw88: 8821c: fix debugfs rssi value Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 033/159] tcp: consume incoming skb leading to a reset Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 040/159] net: sched: use queue_mapping to pick tx queue Sasha Levin
2022-05-30 18:10 ` Jakub Kicinski
2022-06-05 12:55 ` Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 046/159] net: macb: In ZynqMP initialization make SGMII phy configuration optional Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 047/159] ath9k: fix QCA9561 PA bias level Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 062/159] ath11k: disable spectral scan during spectral deinit Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 068/159] ath10k: skip ath10k_halt during suspend for driver state RESTARTING Sasha Levin
2022-05-30 13:22 ` [PATCH AUTOSEL 5.18 073/159] ath11k: fix warning of not found station for bssid in message Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 075/159] ipv6: Don't send rs packets to the interface of ARPHRD_TUNNEL Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 076/159] net/mlx5: use kvfree() for kvzalloc() in mlx5_ct_fs_smfs_matcher_create Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 077/159] net/mlx5: fs, delete the FTE when there are no rules attached to it Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 080/159] mlxsw: spectrum_dcb: Do not warn about priority changes Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 081/159] mlxsw: Treat LLDP packets as control Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 085/159] ice: always check VF VSI pointer values Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 090/159] net/mlx5: Increase FW pre-init timeout for health recovery Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 095/159] net: remove two BUG() from skb_checksum_help() Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 108/159] rtlwifi: Use pr_warn instead of WARN_ONCE Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 109/159] mt76: mt7915: accept rx frames with non-standard VHT MCS10-11 Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 110/159] mt76: mt7921: " Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 111/159] mt76: fix encap offload ethernet type check Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 118/159] usbnet: Run unregister_netdev() before unbind() again Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 119/159] Bluetooth: HCI: Add HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN quirk Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 122/159] bnxt_en: Configure ptp filters during bnxt open Sasha Levin
2022-05-30 13:23 ` [PATCH AUTOSEL 5.18 134/159] net: phy: micrel: Allow probing without .driver_data Sasha Levin
2022-05-30 13:24 ` [PATCH AUTOSEL 5.18 137/159] rtw89: cfo: check mac_id to avoid out-of-bounds Sasha Levin
2022-05-30 13:24 ` [PATCH AUTOSEL 5.18 144/159] can: mcp251xfd: silence clang's -Wunaligned-access warning Sasha Levin
2022-05-30 13:24 ` [PATCH AUTOSEL 5.18 146/159] net: ipa: ignore endianness if there is no header Sasha Levin
2022-05-30 13:24 ` [PATCH AUTOSEL 5.18 148/159] selftests/bpf: Add missing trampoline program type to trampoline_count test Sasha Levin
2022-05-30 13:24 ` [PATCH AUTOSEL 5.18 152/159] rxrpc: Return an error to sendmsg if call failed Sasha Levin
2022-05-30 13:24 ` [PATCH AUTOSEL 5.18 153/159] rxrpc, afs: Fix selection of abort codes Sasha Levin
2022-05-30 13:24 ` [PATCH AUTOSEL 5.18 154/159] afs: Adjust ACK interpretation to try and cope with NAT Sasha Levin
2022-05-30 13:24 ` [PATCH AUTOSEL 5.18 155/159] eth: tg3: silence the GCC 12 array-bounds warning Sasha Levin
2022-05-30 13:24 ` [PATCH AUTOSEL 5.18 157/159] selftests/bpf: fix btf_dump/btf_dump due to recent clang change Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220530132425.1929512-9-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=shuah@kernel.org \
--cc=stable@vger.kernel.org \
--cc=ytcoode@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).