From: Feng Yang <yangfeng59949@163.com>
To: andrii@kernel.org, eddyz87@gmail.com, ast@kernel.org,
daniel@iogearbox.net, memxor@gmail.com, martin.lau@linux.dev,
song@kernel.org, yonghong.song@linux.dev, jolsa@kernel.org,
emil@etsalapatis.com
Cc: bpf@vger.kernel.org, linux-kselftest@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 bpf-next 2/5] selftests/bpf: Fix missing allocation null checks in test_progs.c
Date: Wed, 22 Jul 2026 15:47:45 +0800 [thread overview]
Message-ID: <20260722074748.674080-3-yangfeng59949@163.com> (raw)
In-Reply-To: <20260722074748.674080-1-yangfeng59949@163.com>
From: Feng Yang <yangfeng@kylinos.cn>
Add null checks after memory allocations to prevent potential segmentation faults.
Signed-off-by: Feng Yang <yangfeng@kylinos.cn>
---
tools/testing/selftests/bpf/test_progs.c | 33 ++++++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c
index 1d3caf996971..88c65ce5b018 100644
--- a/tools/testing/selftests/bpf/test_progs.c
+++ b/tools/testing/selftests/bpf/test_progs.c
@@ -730,11 +730,14 @@ int compare_map_keys(int map1_fd, int map2_fd)
int compare_stack_ips(int smap_fd, int amap_fd, int stack_trace_len)
{
__u32 key, next_key, *cur_key_p, *next_key_p;
- char *val_buf1, *val_buf2;
- int i, err = 0;
+ char *val_buf1 = NULL, *val_buf2 = NULL;
+ int i, err = -ENOMEM;
val_buf1 = malloc(stack_trace_len);
val_buf2 = malloc(stack_trace_len);
+ if (!val_buf1 || !val_buf2)
+ goto out;
+ err = 0;
cur_key_p = NULL;
next_key_p = &key;
while (bpf_map_get_next_key(smap_fd, cur_key_p, next_key_p) == 0) {
@@ -1514,6 +1517,8 @@ static int dispatch_thread_send_subtests(int sock_fd, struct test_state *state)
int subtest_num = state->subtest_num;
state->subtest_states = malloc(subtest_num * sizeof(*subtest_state));
+ if (!state->subtest_states)
+ return -ENOMEM;
for (int i = 0; i < subtest_num; i++) {
subtest_state = &state->subtest_states[i];
@@ -1732,9 +1737,24 @@ static void server_main(void)
sigaction(SIGINT, &sigact_int, NULL);
dispatcher_threads = calloc(sizeof(pthread_t), env.workers);
+ if (!dispatcher_threads) {
+ perror("Failed to calloc dispatcher_threads");
+ exit(EXIT_ERR_SETUP_INFRA);
+ }
data = calloc(sizeof(struct dispatch_data), env.workers);
+ if (!data) {
+ perror("Failed to calloc data");
+ free(dispatcher_threads);
+ exit(EXIT_ERR_SETUP_INFRA);
+ }
env.worker_current_test = calloc(sizeof(int), env.workers);
+ if (!env.worker_current_test) {
+ perror("Failed to calloc env.worker_current_test");
+ free(data);
+ free(dispatcher_threads);
+ exit(EXIT_ERR_SETUP_INFRA);
+ }
for (i = 0; i < env.workers; i++) {
int rc;
@@ -2094,7 +2114,16 @@ int main(int argc, char **argv)
env.worker_id = -1; /* main process */
if (env.workers) {
env.worker_pids = calloc(sizeof(pid_t), env.workers);
+ if (!env.worker_pids) {
+ perror("Failed to calloc worker_pids");
+ return -ENOMEM;
+ }
env.worker_socks = calloc(sizeof(int), env.workers);
+ if (!env.worker_socks) {
+ perror("Failed to calloc worker_socks");
+ free(env.worker_pids);
+ return -ENOMEM;
+ }
if (env.debug)
fprintf(stdout, "Launching %d workers.\n", env.workers);
for (i = 0; i < env.workers; i++) {
--
2.43.0
next prev parent reply other threads:[~2026-07-22 7:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-22 7:47 [PATCH v2 bpf-next 0/5] Fix several issues " Feng Yang
2026-07-22 7:47 ` [PATCH v2 bpf-next 1/5] selftests/bpf: Fix double free of subtest_state->name Feng Yang
2026-07-22 7:47 ` Feng Yang [this message]
2026-07-22 8:45 ` [PATCH v2 bpf-next 2/5] selftests/bpf: Fix missing allocation null checks in test_progs.c bot+bpf-ci
2026-07-22 7:47 ` [PATCH v2 bpf-next 3/5] selftests/bpf: Use calloc to allocate subtest_states Feng Yang
2026-07-22 7:47 ` [PATCH v2 bpf-next 4/5] selftests/bpf: Fix memory leak on subtest_states reallocation Feng Yang
2026-07-22 7:47 ` [PATCH v2 bpf-next 5/5] selftests/bpf: Fix potential NULL pointer dereference in strscpy call Feng Yang
2026-07-24 21:33 ` [PATCH v2 bpf-next 0/5] Fix several issues in test_progs.c patchwork-bot+netdevbpf
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=20260722074748.674080-3-yangfeng59949@163.com \
--to=yangfeng59949@163.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=emil@etsalapatis.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=memxor@gmail.com \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
/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
all inboxes | Powered by JetHome®