From patchwork Tue Jan 7 02:06:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Rome X-Patchwork-Id: 13927966 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 C1FBFE77188 for ; Tue, 7 Jan 2025 02:07:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 455CD6B0089; Mon, 6 Jan 2025 21:07:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4066F6B0096; Mon, 6 Jan 2025 21:07:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A6A26B0098; Mon, 6 Jan 2025 21:07:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 00BCC6B0089 for ; Mon, 6 Jan 2025 21:07:06 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B6C13C0624 for ; Tue, 7 Jan 2025 02:07:06 +0000 (UTC) X-FDA: 82979018052.29.59F5B80 Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by imf03.hostedemail.com (Postfix) with ESMTP id DF50A20007 for ; Tue, 7 Jan 2025 02:07:04 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=jordanrome.com header.s=s1-ionos header.b=xGorWKdu; spf=pass (imf03.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=1736215625; 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=bFV8AAWE7WB5PNv7bnDePrI5cbphl4Nbhj6dGOr7osY=; b=7lTdR01kLE6VMOoK71r85AUnnBeKp6JS2QHFC6vmJDuEJKl1nl2qRQcuh6CLslvNawwkEd M/DomOQpxrvJZmiwDZKbeevItWfR+icNKHM4G30V30gB9LgApFckfG+lcGWf35Ii6pUZ1G rdC1z4NpfcCAOF/88KS823KXBzbZtQQ= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=jordanrome.com header.s=s1-ionos header.b=xGorWKdu; spf=pass (imf03.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=1736215625; a=rsa-sha256; cv=none; b=FIEECQAo7Hxg6XkCsjw3Iez6aIqLr8B47JFdQU1OsWA2k07Xg7vXmeLyLfvOwvncfwtRVL NwT7jrT6TRcl6xhK6JziCSbz84QX0kVh5ENCEh6qb2WCVMifS7ntqTmg424roWBCLFB3E3 fU3Tg9y9Lo3Tx2KIdn6HRGia62aHBrA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jordanrome.com; s=s1-ionos; t=1736215607; x=1736820407; i=linux@jordanrome.com; bh=bFV8AAWE7WB5PNv7bnDePrI5cbphl4Nbhj6dGOr7osY=; 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=xGorWKdulKWxh1MyTFrXTIZYCFa9EweLvxPP+7DUeu9oJlWanSDt1X+tmV19shJr gr7c4nnnovIB3mbqsFL3Ok7mi7SqKkHfE3HA6+yytAscYcnX0YGSikc6Lv+WmnUl6 HFf9ubLuno8ovvY10Ig0d99K8teSFsg4nqy3bkTCX4UYuwX8hHN0jIlURdWqlrl4P JPZD2dctxC/j0JPTIWI/z3GU248jv/G7n1tEaHu7MvuZbScqMUKTChuj5qqhgdF52 N/OGGikmojyTBz38xEftUGTX4EgwapamP06YUqKjutBkd3vTV/Vky8C7rWzUOduOi 5zHnQKIgc1KeRZhiEg== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from localhost ([69.171.251.1]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MJmjN-1tBWKk0mAT-00OUD6; Tue, 07 Jan 2025 03:06:47 +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 Subject: [bpf-next v2 2/2] selftests/bpf: Add tests for bpf_copy_from_user_task_str Date: Mon, 6 Jan 2025 18:06:32 -0800 Message-ID: <20250107020632.170883-2-linux@jordanrome.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250107020632.170883-1-linux@jordanrome.com> References: <20250107020632.170883-1-linux@jordanrome.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:1J9yVCZQ2NAHDr9yT0npIqJaYWAKXqcpvuue9cvHHU8bECyraFe TJN/mIMwB+l2oA2KtEmxyhlhfmONio2neaoKrXUeqWFW0cWVjQGKVV99WHFx5MuJqNjbCUh ePNCDTUCIxTBolx7MOtLZWg1guUOd7cFtHjx9su9Vg6ubPsY5q4TxtpDi9NmGX4P5bLW+3C PfKn7TtlYwsdPWUi5bQZw== UI-OutboundReport: notjunk:1;M01:P0:oLGnUhXL2zk=;GQRZa30zLrvE42EoPnh3dcbYV9o eeHYNeQaMPAM9KUNQ9qPHXHffPkO8TQZxIiAD9kU3R76/9zM3x5EPeaqazXgTmJ6lymDVV8zT vjFCVxJabvVpSLeGhSuoGoUaTxV3ktc76ApRZFjMcRSxh3q/GSB+4OsWuP5Uracli5pBCcrfy C7AYXn/VCyE1JrSifEO/GRcoOE7d9N1OxrsdfTEOl6w0R4LXRiR36rDB/drd32+8HWAnvzsNx Tz1V/Qqmr3QP/6/BbUOCypLKFNcmKi9lVTquNQGE2szwH88w3r34EjJps5y4SV1HBtduDuVwq BWFeusfhktoBT9BjBNKrGo1+5FnyqapxGnWFgxBIQkQHnGXZrQ30JRLCWSZNpVZuTwZzlzRUi TtOm82bvnPBH16Kyca83902p6gD9Yr11lpcmV6nPkPIHTriO9AjcAhBQNVyt7MzoSjhRcqAdA Xlmtfw9jDY0+ncTZm7jfsJjmwf9SYAKencvH8CvjeXUw2hCdeyh6O7IfIJCEat0ZzV513QJjn tLpeQVSuqxiH0FYvdmmjuOuatIcSDtKBbEniU6yk067wU4NR5kFWHMev9gvJnQYWCacFjsvww QKwFzb1mMCo5EaP9rBfFrqLqZ3tlm6sV115pPsrNyenlSCmdS1R4gKDspjybP4IFNtNsGUWx1 l8Lgpxd9WM+OVhvV0LQyePykq1qmQBW8ik5TBKmIZ4dSdLE8o5r43PUPvUr2dPPW5CFHfRe6G 9NQvC0ArkN78GR7VvXR8euibcNpu7qOeo4PUAjrsP4wTiNr+rmizLb5Gx4ELDXtEH53q89EbK 9+6a2nh/2khudyNcp2Ba3mHGLqxg7tqxNAwlDBzyJv4r6tAZNz5Uj8EaFoI1t8NsLV6RxUgGM OJMY4tYVIWIDK5hpuS8/0vgmlrFUWjqRuWA/MX1W/1cJDtAIfvVVLV/fDKALZDSc0S78XdHp5 8lDXEIZyVYJGsyiHSqHrNEWKNgjYHZGHlePWlsikuhj3swRGPUhd2GMYwBsFjLXCocYHT9rfV CEXS5b6x2YKUyEeYyxVC0W4sA5ZfR8Dc/CuNU1/ X-Rspamd-Queue-Id: DF50A20007 X-Stat-Signature: u6esx4p7ohgfgpb5jpm46qsrsmm5kwj1 X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1736215624-84197 X-HE-Meta: U2FsdGVkX19xjy/fVDPSt19xtQo0dfytEybCMEkjzMmSs9G7ld6eC65EQ6VCBfQgs/eWOZ2l52sSpBjGoJXlXsbTMlEt75xTQjDOVa0pjf5QSzmqdZpYQcTwVu3xKnQiOYsdVZBinZHAjRvSUPphQJEk9gFhAK16GBdXADAvxtBcANga4sBFSftxTbeygCwS99JuzQT9PxYHfYMojnrYJyQ/0cWQWU6UJxwhhfbkI8qyVt8JYWq8rhkcRkiAhTBWvIWrWD5OHk7AnyQstU3s2t0IwRFjopAH0l9WbqXllFkR5gBVuuQBBpGUs4ljvt4oWH9YM3Llpn9JPdQLDga1xfrEJy9BVFuEbGAj2O19Tx0eZafo2ol8Oa/mw5WnCFeYofQXVowBIYR8KS2WqH428/pFb/elb0vqXnZy4toPkBspQyt8HgRlta111gGorXapCtUIhh8cbmP9UrFaoEu1YbO6cy3dQj6P0QwA2UndEc+mGTKqcY524xCHsif1VelMV8AffHVDTcVth1Hx7vt+suSKea5iyUZAG4z8Cu+WdoAfan1PmxA24vnzl31cZmZF4KIXCOQk/wBCh6BoHLHu/R5Wgf2WmaspluPp1w69PAiW8RRcETOSE2It/Vx2B9s/jTD0SX5BZzFHACn2UwwILV5lFprSJrwCHjQ5cpR5FeM/5Xns+UYJJifIhfwaaE2zix9Kyt148JWYX0fT165n4TU7EDXxFheuT3oaQuiBHd4NZWvqMXDy/qpN6VlUCDiC0EdHq5Rp9p3+YUKBg10WWDL782/hexWowJvAme03vrrLWpTvVVQAiDq1tR4swIhzBkWC3z0t1hqW6w0DWdYX/qfaw6REsQx8us8fAmxoUrcKYs4RJ5ix4qm5WAuFcgK9Fq/JQ893jyM6S04A9bsQhkZn0MXGt8eHB/qpYz0dNYJh417dWbVb7S34t0StGr7iRmofarLwRlurLE3gbVU tJRBVlMf Zmwua+agQVwd84XrViVgNelhJ1TBtFnwzuLft7pDklZ2DH9PmVGdb0Ri3gpDDbUEpTtzUz520Rn/yTzuucnp5Nv3zZ3BH49C+mrvv+VBQ+wvIJ6xh5Hx9PGXs8On2ZxqAvT00uWRIpjkkoEoTrQWvigV3zWCJqwjr/5j7u42qpv/W3xfsTL4Z1W3orWf5JZiwTmEGsNzr7mmlBuwrm4fmcR7t1DAm7gfBhs+9ock+UtSDPX6TgU7F8fbSCiJSOEB+T4l+zuKd9yvsmhwf9hZ75nUdN4ik7voYuVz/Qjzy0h7Zvn4tqi2oQWbrjsdhdiKcmU89VuDP7hsP+7yIACPbfiBFLw== 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 | 7 +++ .../selftests/bpf/prog_tests/read_vsyscall.c | 1 + .../selftests/bpf/progs/bpf_iter_tasks.c | 55 +++++++++++++++++++ .../selftests/bpf/progs/read_vsyscall.c | 6 +- 4 files changed, 67 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..8ed864793bd1 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c @@ -34,6 +34,8 @@ #include "bpf_iter_ksym.skel.h" #include "bpf_iter_sockmap.skel.h" +static char test_data[] = "test_data"; + static void test_btf_id_or_null(void) { struct bpf_iter_test_kern3 *skel; @@ -328,12 +330,17 @@ static void test_task_sleepable(void) if (!ASSERT_OK_PTR(skel, "bpf_iter_tasks__open_and_load")) return; + skel->bss->user_ptr = test_data; 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); } 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..90691e34b915 100644 --- a/tools/testing/selftests/bpf/progs/bpf_iter_tasks.c +++ b/tools/testing/selftests/bpf/progs/bpf_iter_tasks.c @@ -9,6 +9,7 @@ char _license[] SEC("license") = "GPL"; uint32_t tid = 0; int num_unknown_tid = 0; int num_known_tid = 0; +void *user_ptr = 0; SEC("iter/task") int dump_task(struct bpf_iter__task *ctx) @@ -35,7 +36,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 +47,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 +84,57 @@ 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') { + 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') { + 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); + if (bpf_strncmp(task_str2, 10, "test_data\0") != 0 || ret != 10) { + BPF_SEQ_PRINTF(seq, "%s\n", info); + return 0; + } + + /* Shorter length than the string */ + ret = bpf_copy_from_user_task_str((char *)task_str3, 9, user_ptr, task, 0); + if (bpf_strncmp(task_str3, 9, "test_dat\0") != 0 || ret != 9) { + 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; + } + + ++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..623c1c5bd2d0 100644 --- a/tools/testing/selftests/bpf/progs/read_vsyscall.c +++ b/tools/testing/selftests/bpf/progs/read_vsyscall.c @@ -8,14 +8,15 @@ 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 +48,7 @@ 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; }