From patchwork Tue Jan 28 22:43:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Rome X-Patchwork-Id: 13953328 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 847A2C0218A for ; Tue, 28 Jan 2025 22:44:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 126FE280010; Tue, 28 Jan 2025 17:44:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B48D28000D; Tue, 28 Jan 2025 17:44:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6F46280010; Tue, 28 Jan 2025 17:44:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C71F728000D for ; Tue, 28 Jan 2025 17:44:40 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 44FC945710 for ; Tue, 28 Jan 2025 22:44:40 +0000 (UTC) X-FDA: 83058341520.30.3D6E81E Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by imf01.hostedemail.com (Postfix) with ESMTP id 618BD4000B for ; Tue, 28 Jan 2025 22:44:38 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=jordanrome.com header.s=s1-ionos header.b=2tRjXSHe; spf=pass (imf01.hostedemail.com: domain of linux@jordanrome.com designates 74.208.4.194 as permitted sender) smtp.mailfrom=linux@jordanrome.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738104278; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LhJJH5WuMX5aq6LX3M5eXAA/nYkW+PydFm8hbRxet3Y=; b=lL7n0ZOhvxw9mtBVLbryPNkgfjfIN3VvdujM7OXKWD/BqR8ZitMoXLmuwImEEcsoCq6pRV +vzIcHxF4Ux7byFFie9jkkv7TOdTm/09Op5yPGQFcS/lOuV472WFnF0sexhrEkpkPKprhc rtDqYnyT+BU5cR1bfR9MOGpH5KVy3WU= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=jordanrome.com header.s=s1-ionos header.b=2tRjXSHe; spf=pass (imf01.hostedemail.com: domain of linux@jordanrome.com designates 74.208.4.194 as permitted sender) smtp.mailfrom=linux@jordanrome.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738104278; a=rsa-sha256; cv=none; b=KMuKxcarOUVLDp8QVVWpQNL7BaKsK/nFmFNl6fBQH41pda43siHTxXYnOInCdhky0xeABA D6OHtwszmKTbsiYgTtOa84zVjIdWLGsrEGQpwdDPBckYWQkntNBbgVICdmpCN2HMNsMvJ7 M7Se9f7CpYlLG64vLLrxkQ82KT/Zot8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jordanrome.com; s=s1-ionos; t=1738104255; x=1738709055; i=linux@jordanrome.com; bh=LhJJH5WuMX5aq6LX3M5eXAA/nYkW+PydFm8hbRxet3Y=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=2tRjXSHe/cXn1FoqIkguxSxTIWSxQYsaSCPdxkI42RSPpQt2UlWePk1il7Xa6VyB XrAVJVUJn0P2FMPF4YulA3dTrrUI98UlY8zh+SD632nPzq1z2p2KWl0qMZUoIHFkY K2/pOsaIYuf/2env6m/UV83If0p5lhzfGCpBgfbv1wxfHrlaOWX5xwrXCDdIQy2Bw dvAf0Xa/oKS+kIzT1lmkNDQC53fG7zwnxYXwrqUXx3vg/BfKckYkFMW5lOpDZ2CXQ fLYuQo36nBiuCBVjtg6TnW++NQ+Y4+Ta0T75PJ6RvjTK735wi94lMGTd8XfNULd7C G9iL4WKeoB1j/zRYzw== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from localhost ([69.171.251.3]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MwxJ1-1tF1lc0Dhz-00tyiV; Tue, 28 Jan 2025 23:44:15 +0100 From: Jordan Rome To: bpf@vger.kernel.org Cc: linux-mm@kvack.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Kernel Team , Andrew Morton , Shakeel Butt , Alexander Potapenko Subject: [bpf-next v6 3/3] selftests/bpf: Add tests for bpf_copy_from_user_task_str Date: Tue, 28 Jan 2025 14:43:52 -0800 Message-ID: <20250128224352.3808460-3-linux@jordanrome.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250128224352.3808460-1-linux@jordanrome.com> References: <20250128224352.3808460-1-linux@jordanrome.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:dUpyW8ZQI4xCv3r6SWnn1cP0igwa1BlRWYz1XV0OhYgqhhyXbq4 2/ZOwp/r0QLRCb8dTC27YKV12g8V4tHfTxApeitjEOKpVG6/rm9vvlDbR0Ga56y+9MIjDDQ VMjo+x/UdzAZNmt+tXryeel4uAAgiq1Hss6vh5hV8WvyVGETCg5dv/GJimVPvqHNUQwk/Lb jPobii2DRd1EQ4SpTbloA== UI-OutboundReport: notjunk:1;M01:P0:BBG0znHmojc=;jyOkfJqp77N3aFhAWLMgPFmcmEo jOor2fIc/IMLOQUabPQvbCE9fM/ZQp1lsMoEzplfjJkMGjv/On3Xz9SoR1KqyZ4so2NiuY1ng uiAMuRDXhYtE/2QVPj1pbWYVnxDKSOk3YFc7CKBN3YaapwLquS2kh8x7yqJaNDynsLyEy6XSt YnAyEB41gx2wK5wDLpvO4rKRURbTP59yZVWzdrgYJYL3N8Ka1vTImqwHYX7qfnFtraiAP/lA5 3K6+wSzv/SnJP1UO1cE52OPo154CORBEqEr+yqbDs0rlWj6Gh3Bzc+ItkSwc+iefN/sz1l1UH SPH2sNR+fcK6MSFs+T7SCPiUPuqAP2xefPwroNi3T3p1lUbfousbjvadE4tT2ZCSM+lEmhl4x micd13WC/cvOJWoAbJmR5jpdLMLW61clY4jcBt8X5z9nMXTNpDeo6Dogf7v1QP0ljYxtKw0sC H+X57bGhuW7nYKerb3UK1Koe8EEYarOXHHCVebRMKFCeS+tort/uvabwNBmtR/fILKEpcGmfp k9geUhZdkUJM7bPMQYXPSXjkMoTR04A1wRoPptKE8dHx9tA8XhzJzABwp44ioCCVMG6KnYzry N0P2ZnNHd8X9erUAm6W2+GojwYXSHhT341Sq/TLusIyjFbK2o0Q3I+DPlPSEZyqbPSgXle15t JVo2gZLXtod5WV9h/iV5e5TD7Ir7RfWFM/ouuXNwdZcpEPIUbT25AY/XoPRHdC4MZr5IxQdGv oXiGb2zQVhLqcMaFmZJqFYaCkbozJ/spRp/kC42VzId8uIbBsVY3wXxuT4iYwZmN3zldsinRG eZ4IgpxKszf9v6QnVNq/77R4PFs0cD9XcfOocuLB27UYpZu9lwcSCV95/8QmEIXDa8QsPXjeB VAx9awSCslCsxUrUSs3jtP/nYzlBxPMvAWBAi61K3uJVrrVDde1VC/BkTqCt2g0z/Mx3dy4Gx PsauebZ2ziTSjcvKm32kGQG6Wc9Il6I1YW+OSxlAvDvGhkgTHmz/83wCK9GmBrMwZmyHP7sXT X4uhjwjjxk3UuXwCDv0mE+gWKIJ1Rn5M/2xlG+bbIoD4/RrzSFQ06U4ZKwEiVmsNBLBt9kGkw OiB0E3WePbhUv6iCp8ZkA/b3aCY4aWaKTL5dBr0AAu5kF/MjqGKQ== X-Rspamd-Queue-Id: 618BD4000B X-Stat-Signature: yfuapqbzbphefs6pw46wcwo8kqien4gx X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1738104278-349506 X-HE-Meta: U2FsdGVkX18nLjra33U0SADdkNz2lmrpnZXXcHJCtOGWuE3PpWu5RLMawJFdMywaFG9ZotB7t4fCEfL/onP8Kqc2V/wleb5E3PrKmg3rR89qF27urlA9Rd2f+plRAMmLirL1O+tk2us9MeKwanHirWeIjW/gri/snkZh1bZ/tJWwG0xHM+ZI5c3cAY9eZ94jW4uyVaLwYMD/MbHlYyE3Rp824mfbrDeSuAjsCvSWLfOMOAYH6s92I0NLjoIefJdBKfo+Uh4kQwvK7ItQNgfVTbNp/tr73MDSkAsYSOnndPXdVY2j/DwW76uFy9KkIaG5bDy7j282ed1L8z/BoBjS5I3cnqf4KJXNb2mVFvPCmDkJWQ/Uku6uIY2pLofRoh9WzSJ1SQBgFJ0op3Ouqxs9W1eRD0pga09Rrp8Ki3BIUCj4u9APfHle86Hgw3cuHOqskWVg7JsXmoIJQ/Xsc8gyPVap6RUVzWuCNqERGKqe0QJIMXxknTvBK6IxLRdYP1IBL9s/Bps2OKKTZU2x2CsqDr1v02BsANAz1ahYMuuXc1IbbFXYgz9kjTowQkvf2HWdiiWV3UKNwWH8WGdzHUijFvUJahNc6KC9R5bXK6sXZxiWCHkHo8InUjbZLDRCPJ2p3Kc5jntnvRpQYzaRqVNcSQzgdwoHxKMO7lREeTgQcade0/PFHgyL8swgD5UiFBMJm7niEX/4sQZnDDgplqVmPKx+KX0B3KeZlQk8bXz7qIddcM8yS16xYvIWhhnr2uQF7EhtMTXtboF5OH9yb+DIhHAH2T7MBKa/OiM0ibRTFeJCI8f7K3akHkgLsHsoOaHn0H2VzKYQcZN/hlG8NLfcO5DXfrsiWHbljx1aFvTk+jfw+ZrwCQKF9MP9jfzVOl6F4rxf7yZjX0JPzkKoGeNZqPMqDBXxCUOj4azCRUXzFnQceQP1WflfKAqdyqOTL+krG7i93iMnAnzOWzxpKXf XPcT6pKX nmccw9extQThgsgbqIEqX86LaeBVqxM3fZHaSTOgEOqE607zhgBTPMDYFdgPap3e5uodzJssDTLUXtwVoJOOHwndW8P3lEUw1OWdhvABtJxijWgGT2Vq4rx16xqoY2XYFsIj4BAmd29iXt+dsDS8BbEXFaGWq62Mzz4qJC8YSlvghy1ave//LnbuF9Ww8j6qIr94T472GZic2mHk2wavqAIcL/OSJlO+LddG5SyumXHcyaOv5phgMtN3otxaT30TX78qxPLlqTQI4Vw2bPvGFCx8ApIIP3x9LHz/CJyFmTa6YrLm09pCJLbfkIxFXT7O+YuwtmbYSf5ja2umhsuNoBjgTtZtES10uTXsZCeys/K8cnxrCF1OyH514w2HiZBxUdr2t X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: This adds tests for both the happy path and the error path (with and without the BPF_F_PAD_ZEROS flag). Signed-off-by: Jordan Rome --- .../selftests/bpf/prog_tests/bpf_iter.c | 68 +++++++++++ .../selftests/bpf/prog_tests/read_vsyscall.c | 1 + .../selftests/bpf/progs/bpf_iter_tasks.c | 110 ++++++++++++++++++ .../selftests/bpf/progs/read_vsyscall.c | 11 +- 4 files changed, 188 insertions(+), 2 deletions(-) -- 2.43.5 diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c index 6f1bfacd7375..add4a18c33bd 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c @@ -323,19 +323,87 @@ static void test_task_pidfd(void) static void test_task_sleepable(void) { struct bpf_iter_tasks *skel; + int pid, status, err, data_pipe[2], finish_pipe[2], c; + char *test_data = NULL; + char *test_data_long = NULL; + char *data[2]; + + if (!ASSERT_OK(pipe(data_pipe), "data_pipe") || + !ASSERT_OK(pipe(finish_pipe), "finish_pipe")) + return; skel = bpf_iter_tasks__open_and_load(); if (!ASSERT_OK_PTR(skel, "bpf_iter_tasks__open_and_load")) return; + pid = fork(); + if (!ASSERT_GE(pid, 0, "fork")) + return; + + if (pid == 0) { + /* child */ + close(data_pipe[0]); + close(finish_pipe[1]); + + test_data = malloc(sizeof(char) * 10); + strncpy(test_data, "test_data", 10); + test_data[9] = '\0'; + + test_data_long = malloc(sizeof(char) * 5000); + for (int i = 0; i < 5000; ++i) { + if (i % 2 == 0) + test_data_long[i] = 'b'; + else + test_data_long[i] = 'a'; + } + test_data_long[4999] = '\0'; + + data[0] = test_data; + data[1] = test_data_long; + + write(data_pipe[1], &data, sizeof(data)); + + /* keep child alive until after the test */ + err = read(finish_pipe[0], &c, 1); + if (err != 1) + exit(-1); + + close(data_pipe[1]); + close(finish_pipe[0]); + _exit(0); + } + + /* parent */ + close(data_pipe[1]); + close(finish_pipe[0]); + + err = read(data_pipe[0], &data, sizeof(data)); + ASSERT_EQ(err, sizeof(data), "read_check"); + + skel->bss->user_ptr = data[0]; + skel->bss->user_ptr_long = data[1]; + skel->bss->pid = pid; + do_dummy_read(skel->progs.dump_task_sleepable); ASSERT_GT(skel->bss->num_expected_failure_copy_from_user_task, 0, "num_expected_failure_copy_from_user_task"); ASSERT_GT(skel->bss->num_success_copy_from_user_task, 0, "num_success_copy_from_user_task"); + ASSERT_GT(skel->bss->num_expected_failure_copy_from_user_task_str, 0, + "num_expected_failure_copy_from_user_task_str"); + ASSERT_GT(skel->bss->num_success_copy_from_user_task_str, 0, + "num_success_copy_from_user_task_str"); bpf_iter_tasks__destroy(skel); + + write(finish_pipe[1], &c, 1); + err = waitpid(pid, &status, 0); + ASSERT_EQ(err, pid, "waitpid"); + ASSERT_EQ(status, 0, "zero_child_exit"); + + close(data_pipe[0]); + close(finish_pipe[1]); } static void test_task_stack(void) diff --git a/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c b/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c index c7b9ba8b1d06..a8d1eaa67020 100644 --- a/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c +++ b/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c @@ -24,6 +24,7 @@ struct read_ret_desc { { .name = "copy_from_user", .ret = -EFAULT }, { .name = "copy_from_user_task", .ret = -EFAULT }, { .name = "copy_from_user_str", .ret = -EFAULT }, + { .name = "copy_from_user_task_str", .ret = -EFAULT }, }; void test_read_vsyscall(void) diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_tasks.c b/tools/testing/selftests/bpf/progs/bpf_iter_tasks.c index bc10c4e4b4fa..966ee5a7b066 100644 --- a/tools/testing/selftests/bpf/progs/bpf_iter_tasks.c +++ b/tools/testing/selftests/bpf/progs/bpf_iter_tasks.c @@ -9,6 +9,13 @@ char _license[] SEC("license") = "GPL"; uint32_t tid = 0; int num_unknown_tid = 0; int num_known_tid = 0; +void *user_ptr = 0; +void *user_ptr_long = 0; +uint32_t pid = 0; + +static char big_str1[5000]; +static char big_str2[5005]; +static char big_str3[4996]; SEC("iter/task") int dump_task(struct bpf_iter__task *ctx) @@ -35,7 +42,9 @@ int dump_task(struct bpf_iter__task *ctx) } int num_expected_failure_copy_from_user_task = 0; +int num_expected_failure_copy_from_user_task_str = 0; int num_success_copy_from_user_task = 0; +int num_success_copy_from_user_task_str = 0; SEC("iter.s/task") int dump_task_sleepable(struct bpf_iter__task *ctx) @@ -44,6 +53,9 @@ int dump_task_sleepable(struct bpf_iter__task *ctx) struct task_struct *task = ctx->task; static const char info[] = " === END ==="; struct pt_regs *regs; + char task_str1[10] = "aaaaaaaaaa"; + char task_str2[10], task_str3[10]; + char task_str4[20] = "aaaaaaaaaaaaaaaaaaaa"; void *ptr; uint32_t user_data = 0; int ret; @@ -78,8 +90,106 @@ int dump_task_sleepable(struct bpf_iter__task *ctx) BPF_SEQ_PRINTF(seq, "%s\n", info); return 0; } + ++num_success_copy_from_user_task; + /* Read an invalid pointer and ensure we get an error */ + ptr = NULL; + ret = bpf_copy_from_user_task_str((char *)task_str1, sizeof(task_str1), ptr, task, 0); + if (ret >= 0 || task_str1[9] != 'a' || task_str1[0] != '\0') { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + + /* Read an invalid pointer and ensure we get error with pad zeros flag */ + ptr = NULL; + ret = bpf_copy_from_user_task_str((char *)task_str1, sizeof(task_str1), + ptr, task, BPF_F_PAD_ZEROS); + if (ret >= 0 || task_str1[9] != '\0' || task_str1[0] != '\0') { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + + ++num_expected_failure_copy_from_user_task_str; + + /* Same length as the string */ + ret = bpf_copy_from_user_task_str((char *)task_str2, 10, user_ptr, task, 0); + /* only need to do the task pid check once */ + if (bpf_strncmp(task_str2, 10, "test_data\0") != 0 || ret != 10 || task->tgid != pid) { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + + /* Shorter length than the string */ + ret = bpf_copy_from_user_task_str((char *)task_str3, 2, user_ptr, task, 0); + if (bpf_strncmp(task_str3, 2, "t\0") != 0 || ret != 2) { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + + /* Longer length than the string */ + ret = bpf_copy_from_user_task_str((char *)task_str4, 20, user_ptr, task, 0); + if (bpf_strncmp(task_str4, 10, "test_data\0") != 0 || ret != 10 + || task_str4[sizeof(task_str4) - 1] != 'a') { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + + /* Longer length than the string with pad zeros flag */ + ret = bpf_copy_from_user_task_str((char *)task_str4, 20, user_ptr, task, BPF_F_PAD_ZEROS); + if (bpf_strncmp(task_str4, 10, "test_data\0") != 0 || ret != 10 + || task_str4[sizeof(task_str4) - 1] != '\0') { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + + /* Longer length than the string past a page boundary */ + ret = bpf_copy_from_user_task_str(big_str1, 5000, user_ptr, task, 0); + if (bpf_strncmp(big_str1, 10, "test_data\0") != 0 || ret != 10) { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + + /* String that crosses a page boundary */ + ret = bpf_copy_from_user_task_str(big_str1, 5000, user_ptr_long, task, BPF_F_PAD_ZEROS); + if (bpf_strncmp(big_str1, 4, "baba") != 0 || ret != 5000 + || bpf_strncmp(big_str1 + 4996, 4, "bab\0") != 0) { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + + for (int i = 0; i < 4999; ++i) { + if (i % 2 == 0) { + if (big_str1[i] != 'b') { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + } else { + if (big_str1[i] != 'a') { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + } + } + + /* Longer length than the string that crosses a page boundary */ + ret = bpf_copy_from_user_task_str(big_str2, 5005, user_ptr_long, task, BPF_F_PAD_ZEROS); + if (bpf_strncmp(big_str2, 4, "baba") != 0 || ret != 5000 + || bpf_strncmp(big_str2 + 4996, 5, "bab\0\0") != 0) { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + + /* Shorter length than the string that crosses a page boundary */ + ret = bpf_copy_from_user_task_str(big_str3, 4996, user_ptr_long, task, 0); + if (bpf_strncmp(big_str3, 4, "baba") != 0 || ret != 4996 + || bpf_strncmp(big_str3 + 4992, 4, "bab\0") != 0) { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + + ++num_success_copy_from_user_task_str; + if (ctx->meta->seq_num == 0) BPF_SEQ_PRINTF(seq, " tgid gid data\n"); diff --git a/tools/testing/selftests/bpf/progs/read_vsyscall.c b/tools/testing/selftests/bpf/progs/read_vsyscall.c index 39ebef430059..395591374d4f 100644 --- a/tools/testing/selftests/bpf/progs/read_vsyscall.c +++ b/tools/testing/selftests/bpf/progs/read_vsyscall.c @@ -8,14 +8,16 @@ int target_pid = 0; void *user_ptr = 0; -int read_ret[9]; +int read_ret[10]; char _license[] SEC("license") = "GPL"; /* - * This is the only kfunc, the others are helpers + * These are the kfuncs, the others are helpers */ int bpf_copy_from_user_str(void *dst, u32, const void *, u64) __weak __ksym; +int bpf_copy_from_user_task_str(void *dst, u32, const void *, + struct task_struct *, u64) __weak __ksym; SEC("fentry/" SYS_PREFIX "sys_nanosleep") int do_probe_read(void *ctx) @@ -47,6 +49,11 @@ int do_copy_from_user(void *ctx) read_ret[7] = bpf_copy_from_user_task(buf, sizeof(buf), user_ptr, bpf_get_current_task_btf(), 0); read_ret[8] = bpf_copy_from_user_str((char *)buf, sizeof(buf), user_ptr, 0); + read_ret[9] = bpf_copy_from_user_task_str((char *)buf, + sizeof(buf), + user_ptr, + bpf_get_current_task_btf(), + 0); return 0; }