From patchwork Mon Feb 10 22:16:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Rome X-Patchwork-Id: 13968632 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 7578DC02198 for ; Mon, 10 Feb 2025 22:17:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 084F228000B; Mon, 10 Feb 2025 17:17:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 034DD280006; Mon, 10 Feb 2025 17:17:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF14A28000B; Mon, 10 Feb 2025 17:17:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id BF14A280006 for ; Mon, 10 Feb 2025 17:17:11 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 72B111604F6 for ; Mon, 10 Feb 2025 22:17:11 +0000 (UTC) X-FDA: 83105446662.28.FF50D17 Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by imf14.hostedemail.com (Postfix) with ESMTP id 8D60610000A for ; Mon, 10 Feb 2025 22:17:09 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=jordanrome.com header.s=s1-ionos header.b=kbppA2X9; spf=pass (imf14.hostedemail.com: domain of linux@jordanrome.com designates 74.208.4.196 as permitted sender) smtp.mailfrom=linux@jordanrome.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739225829; a=rsa-sha256; cv=none; b=VP8k2qoHfkpm3UV3VwvOl42+G+7g+bYFkRUv0oEjJf1eH3ra82HR7P7lzVXYRrl8bJeTwI MjWXC0DBFbFIbrgIkhXCBc/HqNNwjfC2JOGx/mzyWhf8HTugUNPj2mmQixIJ/zlva2jyAG VMP8t0/ZtliNblS64S+PlYJCwIgR0U4= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=jordanrome.com header.s=s1-ionos header.b=kbppA2X9; spf=pass (imf14.hostedemail.com: domain of linux@jordanrome.com designates 74.208.4.196 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=1739225829; 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=2MSrb3O3a6QRxKePya89Axc31g9ovsOkqTcrVZJ2dy5OYsO1SNvCp/4och2Eg/pDzzfPqW SmqRhzx/hZ0+t83hWKbRhGyv7Wi/A5ikqkY3vewnh5N28D5bWYAlnz3m9CPK3pjx4Qi6zU mo7ZIE9b6ekgPUbQrLApAn0TCV4aJaM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jordanrome.com; s=s1-ionos; t=1739225800; x=1739830600; 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=kbppA2X9lp4HV9p/fSZ7ZX7COxEK2xZAgVPBkc4oY+FGFKbHZP96dyeScCdiqBtQ MOg49PI3DPelGfVouokbFUggTVrnAaCp453Stk69YSwLpEbHiXzbL0HtYlrh5eVoa ComlbQQAICzz2HMDzpnzHS5S0Dfrcq8MSV21GXl6VUkBfqUqtynFuSxut3JcMgnE7 dfjKrSSBLFp53CmUA3Yj0sTqFH13nGBrZbAFv3t5vFNBH4h6I9Py1uhOlpAG4WHI3 Jzjsy1xYP1sBXzoYwW6KQLWSHS+N+Yog9PEtdvCriOJppQMVaGtDSdKDfaftwM30Z +vvrK4xMDWmr/USqRw== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from localhost ([69.171.251.8]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MXJY3-1tw4Xl2evN-00WYTR; Mon, 10 Feb 2025 23:16:40 +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 v7 3/3] selftests/bpf: Add tests for bpf_copy_from_user_task_str Date: Mon, 10 Feb 2025 14:16:26 -0800 Message-ID: <20250210221626.2098522-3-linux@jordanrome.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250210221626.2098522-1-linux@jordanrome.com> References: <20250210221626.2098522-1-linux@jordanrome.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:rodj2MYcuAbXFChH1oH6zsmF7imrjIQv8jjEaoyBkAjNHKmW9ts 1bmnnXCS0Wvj7gGViaayE/+897AdXvzD6W8sNnWtz3CmIAQsbB+guqKq/c+gFcqWPZMd0ei +ebdl9g75+L6TdDY4HP5u6J7wmX68ZPgmgKKSqmutCaReZCPYlOV7qEVYF7yZoBhrzkwHgj gixScR+f+Xo3trU4r6RiQ== UI-OutboundReport: notjunk:1;M01:P0:bL0YwG6w2nI=;PqYdef34nimU2bBV+LAl2B9wzP5 rdwP0lDX0Uymt5PjdWsvpneLhj4jZshN1VJYGlTZVcHkPcOmajYsKQjxnGjZjTY1Ob9QfjInP 8iKlrqZbBL0V4WRt2bbIxQyOoY4KIyz9XesVUja5CFZPtyodN0LsXuYaJBv9iKop/hBXMPY+9 jjXvngDu6hrW30WFYXHwI4pOlGafEXJOifcYbG+jZgrjquWYxT7UvA2e/kU+D6OKpocsilwk6 4PMfmNWp1yoyBOijgaKgRskwjXQ+Os6vZo6MKXhnCFf7Kx1qdE7N5ZdK54dt4m4939dGEbeFx s7nDkCznWUvkaQMap49nO79SwNJ6x5QBvVCGx8r0uMCTk9LDiUBioTgOD9arEOV/miJqG8hJQ CxqE2p6asxVPX1KpzA0i/iCRE/0CrlVrOtubX+UJNg6Bc8myrUml66veHXyVWcys8pL42rpf1 XxVNZ0P4bAo/revHMf/tEroZ0/CP7aAxXJ6ylfpR4bg8aVsvyXKYEViLg7iaM9qUx3JwQgFjg Och2CbZryd+OPKrXz3WYPmLYWYJcZ1CbloTZ7MomvSl+OAhv1se1VMI81LkvCVr91CqmXKMin pdKge7z1jCIxWonGpkvbapEHWKSoPKUu6OleKXjrpYBcUAqTfDrIZ01MAKyB3N9MjOsyIDhr8 NGB+mbmsAU547EITYNZuJDYhhqndbZKtDXoSbUpMvaLLXatEjxR0Svv1a+Z9+wPsAjD9a8KtP Hvl9e0bGSPgTtEVCrrq+rQ4xRTitRdmpT1/5FG+qsNYUfX6UDrpL7x3Nfw1epTZWZWOiAOWNL PYXeL5pwFy4+M7IEVqwkcj9Jx061LMhx7IVe+DPeOI6XF5jrLJfstOt9im5Rhws8DyGli6Fkq i75Ay00YnIyekcSOkEKwYnZeGrXSyDbauJkifGkG6gxB30NhQfrmlVu+9zrEPHbqS47wM5OYf 5ivcX3qJRtg1KS+vyS2WhVdgYhpxi1cl2458HAmOyvkOzfbktRhoVbxoSI6CvW/8dn1d1HhSP mptev5KVHP2V/lb0i8BfFDlW6Px+YSD9x9ydcYr2AKIVs/ndzY5lK/R2Mj4hJ+JvU9K+TORR/ kkkosUlfMdkG9z30V8uIUx96O4xQUFbZAjcIQ/fSN24Ju0HwpqchtrOgYWJmQoJnnUfbLHaKJ cFIWhIdATzZgYBGObbnalORtRZOoTmA2aRJCRDl7dlSX0ksoQSi0DvPNumst+1NHGpimoUy5U +TRK8dV3F1G+nkbTAf83Qa/oLQBkNfD0DXuLHh2G4KGC6tvbp+TODi5gqBXm82onDKBjVmOfY udSmbS58DhSMP6Pt3Xk8O8fP6BXST4246vTpHkNTKlRMUY= X-Rspamd-Queue-Id: 8D60610000A X-Stat-Signature: xgz3sqhkttr9n1krhwindssw6nih9ybj X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739225829-957393 X-HE-Meta: U2FsdGVkX1/HMTqAm1lB9q2Z8mfAgkkhXdok/iXZRBv9ZOU5i7IT4uqTM8GdSn0p4XsbjP/226RpOeLWPIXrATvgx+OW/7zfCZ2iNOQDsanZS0du1YwLizrDI6/Sv+vGAN0Q/dD+8/J/lhjwr56Yu0ebCZKBTr4bnf5ZmY0PvZRz0m6+3wKUYS9xj0/uhF0mSzFcL7jWIVHyVvR6wsDwSfNqCG8dGUikaiObsvUxLO607Sk9j/QXO+avguW7R9iUPBw7XyQqh/H+Q1C/u/1+ZXExFaGglTO03IlbA7sesKZr/bOIcJFrCDh5cEtDhRwO1Xr1CLsLoAwE3x6ls3imRy4tmO9rFGgv+uOdGbLm72r/LdyPykqFVU6KWZKFUmj0mPxsHIWHUZx7XdbQpU660rUe9oMbxCP39SEosq0s6u/BQhiX5evjBUF+iSQ3pbpOSS/kd+bZM3XWfE0zwkrrk90xSEEpt0C7XKhUbrDeih0qHk4przAIZzS3Ylr6kzqf2Qb+Wdi0J+raK2jpklOu4qufC3NiRcmgUTbTCuPFxkN1YkPDuT9dsiXE4oBwoFiIYLic983kFG18MbRjZK3eZxCpis28tycnYunKnxt3O8MbXmQZdKLZX9qL97PTVrpZB9goQy8DFB5zAvfDob8utPockgwBwnJzLCv/KVHhz7ej0BD4OB80vo07lEqlBR8yZuXfRWJEvNX/tVROapOL/4ORIyzYzkQEY7/c3RWbDQdZU9Q2ZqmTf8yp4gkXjZ+esE3X0tOoYpgJm5ziLqPuCY74eR3Aad6Erg60YXUq+KLVP84thCBnmg08ZEwirscu4Nhi1bfgj2+haNqO3uVATUTq4nK0ySSGzUsTmvbPYGapfdQbazHirWGefO03QzDyMcpoLmBgRdCrB0zO0W90NuQPdDCmVCUzhTkXGTkOJIpHbY+SXx2QMUFvSIG8yZT40J905BNYiL1XNgoo7BM oTru5aHX cH26xVMFNzU5TbRu7qHNcqPYt54tkx3Dr66/r3KD3vvvR40DqCbnhEwFnOl8Dv4TECu/e2iNjJDcLzwr0T3P43SxsKI9wdaPEIGVupCM/sQSJHlS67GAfARSGfuvpmYA+VLdMDat4Yfd5XbLb3qOcDm9bnhGmFj6M0fdRKCxyOmDf/pr8Q4uKN5fxIKHKqUrJ6aegFF6A9Ti8K7t3fGukMoPZ+louecNALYj9byNVkWL5BaTIqG0MJtUs9srq2hPtmpD6Hvk1IyYABuYYRSRrBDV8pbBiLMSuiLbVwaccYGaXt40qr9yD2Kxvj/5ff6Vr0Gh3Jdzy/PeJ7Pd3ZdLm+qiBRgO8KqowFpnhu6O0ej4g3kA+DRYSLW+/YZ68L8LHT2l6cWcoj6QF8VCsx6dppGZTICnSnDjgASo5STU8OJ/+o4rJlsKcsLEtst/BT6YQcoRPadKtneAwAavfuivdMPYJvhbvka7swoE2cRZNMYht3WIb8YCtVde14A== 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; }