From patchwork Thu Feb 13 15:21:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Rome X-Patchwork-Id: 13973453 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 222DCC0219D for ; Thu, 13 Feb 2025 15:21:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E8F96B007B; Thu, 13 Feb 2025 10:21:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 598FC6B0082; Thu, 13 Feb 2025 10:21:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 439C06B0083; Thu, 13 Feb 2025 10:21:44 -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 29C2F6B007B for ; Thu, 13 Feb 2025 10:21:44 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C43E11A0F1C for ; Thu, 13 Feb 2025 15:21:43 +0000 (UTC) X-FDA: 83115286086.09.0671473 Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by imf02.hostedemail.com (Postfix) with ESMTP id 67FE080018 for ; Thu, 13 Feb 2025 15:21:41 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=jordanrome.com header.s=s1-ionos header.b=VLb5JBuU; spf=pass (imf02.hostedemail.com: domain of linux@jordanrome.com designates 74.208.4.197 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=1739460101; 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=YETcbBvq3xGIrkTYhsewPKrxvUILyAeRBcAf4MMyvb+ZP9E5zQtMAzEvfAULwU762Qvn7b QVxv2DVDeiJcYey7vTHOYUbOUbLW7BtRShdZoiY0VfpPvxkr43z1Vdm0xc6JHWsNsNeNZY sBURUkSK4W6dsCFy9Aa9jPWieXhPve4= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=jordanrome.com header.s=s1-ionos header.b=VLb5JBuU; spf=pass (imf02.hostedemail.com: domain of linux@jordanrome.com designates 74.208.4.197 as permitted sender) smtp.mailfrom=linux@jordanrome.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739460101; a=rsa-sha256; cv=none; b=gMOynV+8npXXpv6OVITrpJUpNutBHW128raH8I8DYjeiKtfcSAoYsgFyK0HCnQr5Lf92QO kweY0mwgqecWsT6Tc0Ijh4dvIrqdvV5s70LJJHgCeqeBWeD++XLAt0JZIDE8fjeX7IIpYq EZce6IBTjnDw4jM1Kd/lI+U3MLWqBgA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jordanrome.com; s=s1-ionos; t=1739460100; x=1740064900; 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=VLb5JBuUHlfYw+OraxHRJ6EObYdRWYZz5P2vI4DbiNjhScDL3+cMCVGh4qokVZuA 3bNJd1eCwXscRIIZB/BaQDD2OTvLzKX4qu/dh4MuuwTZeJk1JtIerljaSvtfDWlVN FgzQ0Xrfe1CWTna5x8gH7OaK+cLs8Dldu9z9iiVVT3/nf60vS4nKXHOkFNQW1ATWx K0/VdwElU0j3I59d7Ek2O3O776V7yRbJiGBqAQh4plFLHJi4P9OMi6zbpcZYZsV4q obgMDaxHTn2aO4JB8XMrCqJRAZvMH29nWNEVJ8FqqdgWHzhcEz8VAB7tvO+rFvs6Z rzjDH6FOsq9o97fvKA== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from localhost ([69.171.251.116]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MNtKu-1u2TN53wZE-00IAZ6; Thu, 13 Feb 2025 16:21: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 v8 3/3] selftests/bpf: Add tests for bpf_copy_from_user_task_str Date: Thu, 13 Feb 2025 07:21:25 -0800 Message-ID: <20250213152125.1837400-3-linux@jordanrome.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250213152125.1837400-1-linux@jordanrome.com> References: <20250213152125.1837400-1-linux@jordanrome.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:QGmsxtd2pwzybjQU2337r3gVE4JGTCnpugI9n8QggzZMQPhZKZG 0wgR1zf3MmqORF56fgKuGj44TsdK9nwOPzFfb41XgwUb+P+8SVvEzUGUPJQt0q3AiD5ZViR CmIWgykpXpZJC5F2Y2cKXcY+Qd2IRMksrbDPCazkSta8Hl7Iq8EOFdQ8JgqJz7cXNBHrvea kApddgAMNHI6H7asCSX2g== UI-OutboundReport: notjunk:1;M01:P0:lhigDtmcOQM=;G5M1VqpqLY7VYJC7ReA8nhR+7EI e32kjD4wfIBoEFq3RGuulOgJriqKdIZXIc3klRVPysQS2uCYb+Od1JcOdXOo1QX80557XRtj2 Oia3y32K/KE0WaPNsyLm4UZEg+znJj6xS/0D33eSZ4n6Ngw17bsU5db2eYv2r86w9s2UiNVnn 6OehSn6E/dYa8Sws9ajRuJq7vAj/Db3odjmjXrOnvPrlLnKBPy5OSOgxe3WyM+op/RFGw90ui +wXZ0xEGuaBL1UgrTlnQBlwHOsz8ChAJKKk+vJdbJvTMNakMl6GxYemNw/lB+XUhiAfUhM/JL KuTKw7pI4EA+ktlKg72lRjWA6bcOI4jUA8mDX6WqR8NhskjD51nR92k8/F+v52p1lDvRctmKY oo5TPy7tCEwbdq3s62M8GTWrP7DeGFLSVOsPUuJRt00rqLSDgUBFhxD+7NUtPUGbg+6QSXlk0 p0TXzn7eT+wDp2Vukn2p9lTptdd+6nne5Z1LPNgscPPowVgtBIb1nea8QGpjy/SdX2Km1p0O/ DbC/ccOpq1+Di8nWE4pSpCpbG5H/XPMC8gdwNqHOVT6WruOu2F+PTrh6Jsjz4RvIGf7y2wNtz HkbjzwAjCojnN7skLVphzRhXfXQmI4NjxHMeKsTMHjyijOoUUE0dKm847P0fTaauuwRd8LsC4 zwg1EJG5FQrOwpbiBB1cm79LP8d0yI02135C5VCm3jUEDpajj3yMF1K0Oboqaf86iil9Enl+N 7Vs2MOVIVOXWJfP7QADauOieA27SNZSFOIlQRQ4lqOE4XEOGkoyXng2uIXCPZ2zqiBA9967M5 vZ0b/0op9dsfJ8thKFRsqlD1jTcgdYI+mhgOnN5vts83mLttHMGr/02rXfMaHS6ObOeEd1Nt6 4DsMUFwT8MGLrIjDTCIEssqMKWec35XmCHwXftQT+cTXJooxl4wMa+mS6c8DCG2JjTbCzZLQ6 wMvMrtI/7xII1I5lCWcZVuO5JyWdJmO4F7PiQLK8nCXXZ65mpsLCkSyWhMQTi4aJ5VSvvtJIP 7eP3X/O8Zi19ZYsRId7fAEt5VbRkhz4cb2Pc8X5ztIPKgLbfaoqg+jYz+LEGs/os44Y2yGMjA lkaW+AeK9k5n2OtCOyAnfshB6tuuFlTACwIbeBbEmNKD9uFO/odNOfus5aV9Bd/jFj3emBKh8 ZkXWh5SHt0krRvl1dUaVJLpK+NtkGDufcUPmQfv8D/wr89JFOV3caZaJuiTRGOxQZDq5UW5Ug GQHv7FLMqx8aoWB2xYhqQ+KN3dEHU7vWaDbxcclYxvpweyyueffjlwb1WFtfj+HgFCQoR7Ftf 23APSQ8K6v2LXi8ZGLsZEiwIbRIXT4BZsSS6VSCuW5zjLRHoNUIVbJ4SJEbc7imGoSR X-Rspamd-Queue-Id: 67FE080018 X-Stat-Signature: 9hg1m3uoasywoz7jz1jcwkkh37f3cnte X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1739460101-447644 X-HE-Meta: U2FsdGVkX18pj4gozQeunMdU/d4mie7uC90R5QODLb2MoE8k969WUn6Q15injC7iMpHxjLUJpytLHDT8vRV+PepycyhGEObRHJrwYB/gQ1m2y8Xrvvx7dOwKb3BdZIiMks3jmiZ8sdM9gEjsRESGVEoBbJj4EcS9dOLyei1dT8+m5T93bdV5YoGpMitfs4lPb9JfttKPMuraFi4x3EXRf3IMjF7Am7+x9EPBsB39Vwzn1SByjtgnS+HH4u86WZnrImpAjkJkz8a/5PtCQQMz4ZHyoZN2nCWNUIlotvPw1WAiG5rFoqBdJ+kH5de1JQOUvQEKYFPc6Ys+Eqd8YScpPJrTH663VjFuMdcgA1O9+pIByxHaLjfBylrnu8TJGHfn9OyS3czr/+ArdAqZQV5s0ZH8ks2a5meRTRy6YhSJe7FXgHZ19cpqJGTze2jP95NfW9RwxPjKT0z0NrxE2QFY2r4J7NQbI11vMXl5SpGUo0WoWauMcyZMPDG9wMeZhKdtqBzTctq8drQVAvlATbLWQiw+qyy8DP0dO7xS3oiVBmxj4gU2MSMzQTGJxGkS80c0PPLh0iEpE4zZUH8pwrnfbyuqhD4fWy0zkRVdF/JihFHadELspT3C0BnQ8B+5UCeTvkgUi2qiURTkhvJQ79zv8V6Pv8W+6HFHaY/wbphWnDhePaV1B3a4NAtzA7/VCqkJznx8jCWNrbuV1dpvo2rT//uO5Mn2TFb9vKu99blkILBHKickL1Rozi/jUZ9h0UDJAbH2CHKVvMq4Rf5q2MCJT/Mbd6LhNdM0AWI+34Xo5w5vNsHCn3W3Ge8AfH0DaezWGMtAWoK80mbyPbHT7r7znkuXJ+QWQuOykvbPDic37gXLV5Z6AOg1+B74GqejN337DVUd8IfLOjcKUhgXwqIbNy5AOk+tAPMRFRmbeEljTQc/bMYlzwNV0EkycFjsmVK9wstPn7Ubb8w9XVI4V+Q chWc4noy 51T4JYt+2Z1mfHBRXazolpLEMTFpCmPvEadEfFE1qHKV6ySCSRVQjLWTz1PQAH0IK6sYOslItgD6Q7BrFJv23jFmEjiCukZluQsZz9NLVAHcBrs5XPe9Pd5J8zVPj0MSPx6sdprB0auydVF6UvZsKKNljvyc6Xa5PS1gZhdVS8eawSueQ3h5/2O3jARsPj2N/YGSABGa1036IygnR2RmI9biP7I3VULO7fHxSoarPybRssbFTgci4EhLj1BsyzpH0o6OkouvskcQffpo8F3Jk5RkuRy8EV7Jt1IqtbWAI08n5c0w7koAVMy/tqU7LY6rT7CA1fkSgG1JT24flZsfjfAiLgbZSBabs/4QQSmHmRGfRyQpEEaFFKrKk4ATdLHChEQCA 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; }