From patchwork Wed Oct 30 20:37:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tycho Andersen X-Patchwork-Id: 13857144 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 3281ED6B6D6 for ; Wed, 30 Oct 2024 20:38:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CAB3C8D0003; Wed, 30 Oct 2024 16:38:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C592C8D0001; Wed, 30 Oct 2024 16:38:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A84038D0003; Wed, 30 Oct 2024 16:38:30 -0400 (EDT) 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 8DDFA8D0001 for ; Wed, 30 Oct 2024 16:38:30 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4888D1A01E7 for ; Wed, 30 Oct 2024 20:38:30 +0000 (UTC) X-FDA: 82731430488.27.08A990D Received: from fhigh-b5-smtp.messagingengine.com (fhigh-b5-smtp.messagingengine.com [202.12.124.156]) by imf21.hostedemail.com (Postfix) with ESMTP id 740F11C0018 for ; Wed, 30 Oct 2024 20:37:38 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=tycho.pizza header.s=fm2 header.b="m PikVvj"; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=UjSz8CwY; spf=pass (imf21.hostedemail.com: domain of tycho@tycho.pizza designates 202.12.124.156 as permitted sender) smtp.mailfrom=tycho@tycho.pizza; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730320547; 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=0r+XHUZuZsMcFUus8OxUh/faPdt2sC3qEYpfg2ntVAY=; b=S7yW4o/chSsQwhSJYBcg3raNM7/0HOLkZ5kBVEXuVRyJq7IDOVxHkti1OTRGrsgPmfL1bM vl4g4kvVWC7aeiK/V7AWHA3vLcJkBjMmADuj3zFJ/lNxT16HvK4MqQWjDiRZyYC+IsvIAc PhaGS9DwhAJCwmluPO1w+/jwxNMnjZc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730320547; a=rsa-sha256; cv=none; b=4Fdbejj6oBl6MtZ+c9kkDnF3yG8GXTWKV/jC4FkSXAoYFw8Usb90/+gcduPR01nO73leIS vw0H2qmFfYpgoAjONsRdoxGgANwocfzVDup6PPOfoaBOiriOxxT7QpcNHtOeucsxiPkt5d Dp5r4yAM40B0fvPjt6auynodSXBcCik= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=tycho.pizza header.s=fm2 header.b="m PikVvj"; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=UjSz8CwY; spf=pass (imf21.hostedemail.com: domain of tycho@tycho.pizza designates 202.12.124.156 as permitted sender) smtp.mailfrom=tycho@tycho.pizza; dmarc=none Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfhigh.stl.internal (Postfix) with ESMTP id 3C97D25400FD; Wed, 30 Oct 2024 16:38:27 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Wed, 30 Oct 2024 16:38:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tycho.pizza; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1730320707; x= 1730407107; bh=0r+XHUZuZsMcFUus8OxUh/faPdt2sC3qEYpfg2ntVAY=; b=m PikVvjpOOulDgJtt8fgJTv9y0iR5xoLilAgtN6rIt4VVviX/+ngC9myYslvm/doh BJvXJFkgmvCETTLYEODn7SulKFV7FWMcl8JO1FCtZbP01LrCQ/SDZAwk4g8QW8Bk sQAJBim33GWyg/irw9rXQ0TyWQ1WIJo/JRPUM5BwqR/fbokPszgZ+aUPyuNRuATc fC34fYM5q6EFIttJlGQjWSptyN7mkfS07nxTfpNqAdayUt8UyFMPFlAOZXW+GWG9 mHlzbYvCAC+zthlVkg6Oc/b+2mXYeNX+Tzy83saT7TyYnV4KQuT/NrVB/7yjtFDK 3FpBnzmiCACXWZnL4g87w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1730320707; x=1730407107; bh=0 r+XHUZuZsMcFUus8OxUh/faPdt2sC3qEYpfg2ntVAY=; b=UjSz8CwY2Ltr8JVOc KvByOmqULkJtsP4Om3hiYbwJ0nDqXUcNidrQg0YsM5ueB6BfceukpCsorVRBGao2 uLJX0YKuwALEvDBPlISSHXKc5oK8lF1VdU6h1xazpDP5ecLxI2jTf0hQC6XqlN/4 QXizqbm4iwoWxYOtl4Hx0H8OfRbL6ot6DkTpxxGcVPJIN3GquoiJZnQVqnvZhSpH 4+hi/wqYD0v6422jQ5dgF6AoZVKLLgroXcfeOtUq1YnhMkaZJTt0ww4XVzA9baec oAUmm3fbbc/0J8dXidWmfjmNAf84Zh/E3817Ze4CaRfnvPd3c7RJmOicLI7zyLQ1 IUPJw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdekfedgudefkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddt necuhfhrohhmpefvhigthhhoucetnhguvghrshgvnhcuoehthigthhhosehthigthhhord hpihiiiigrqeenucggtffrrghtthgvrhhnpefhvefhvddvffeufffgffejheelffeffeff ueehgeevvdeggfeufeekudeikefgleenucffohhmrghinhepkhgvrhhnvghlrdhorhhgne cuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepthihtghh ohesthihtghhohdrphhiiiiirgdpnhgspghrtghpthhtohepudegpdhmohguvgepshhmth hpohhuthdprhgtphhtthhopehvihhrohesiigvnhhivhdrlhhinhhugidrohhrghdruhhk pdhrtghpthhtohepsghrrghunhgvrheskhgvrhhnvghlrdhorhhgpdhrtghpthhtohepjh grtghksehsuhhsvgdrtgiipdhrtghpthhtohepvggsihgvuggvrhhmseigmhhishhsihho nhdrtghomhdprhgtphhtthhopehkvggvsheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoh epshhkhhgrnheslhhinhhugihfohhunhgurghtihhonhdrohhrghdprhgtphhtthhopeii sgihshiivghksehinhdrfigrfidrphhlpdhrtghpthhtoheptgihphhhrghrsegthihphh grrhdrtghomhdprhgtphhtthhopehlihhnuhigqdhfshguvghvvghlsehvghgvrhdrkhgv rhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i21f147d5:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 30 Oct 2024 16:38:24 -0400 (EDT) From: Tycho Andersen To: Alexander Viro , Christian Brauner , Jan Kara , Eric Biederman , Kees Cook , Shuah Khan Cc: =?utf-8?q?Zbigniew_J=C4=99drzejewski-Szmek?= , Aleksa Sarai , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Tycho Andersen , Tycho Andersen Subject: [PATCH 2/2] selftests/exec: add a test for execveat()'s comm Date: Wed, 30 Oct 2024 14:37:32 -0600 Message-Id: <20241030203732.248767-2-tycho@tycho.pizza> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241030203732.248767-1-tycho@tycho.pizza> References: <20241030203732.248767-1-tycho@tycho.pizza> MIME-Version: 1.0 X-Stat-Signature: q1o8bzdammr8r6jbkbefwefeq1cd4467 X-Rspamd-Queue-Id: 740F11C0018 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1730320658-258610 X-HE-Meta: U2FsdGVkX1+LbKdn5pO4WOx+n8RLLej53CXrghS9bWmfA4XPvlabEdn0RR2EBe5k1+ZhBjCb2Z9CiMnqklVzyEMhZZscmvtvOPUP2uzjzLKT2QWim+xDAhb9wS4A/i0MRKVy/MHGsZk1V/eiXOSK2JlDPr7kiR4s3b28Vr6z4A9/zGSuwgRK6lmsTMGSB8vxUEd3gi6oLXvpfMm16y0MaiptO+lV38k1vu4Gykwkq+1QpQcVnA09KI9GX2pnRiWuaDoDa0c6yDCh/bVR9mEIxW/6tfDuMPnLSJ1inNZz9Q1lqEdkJbVM2ex4srwFSjPVcdzZLX3d3o8BNy168i/KoGGHIW4+BGwzECEtjk/raEEB72vJep+pXWmnmidHH9n3TZYQb4Mt1E1rep/n5TOiBzmVDBGMcwObf2RD2JoiQdnPe3Gk4fCPzjiTevOZwwP8tH+zGL/GoNYzEqM6DmyB0g6Bl4It5YwlwSYdKRhbbNB73CgMCsUpY7uM38XKpmHeAuaYsUrvw37PvhGa1WdADZ2hHKGeX326dgXuxAzc5MjlBJVn022LheQIaWP8qgsnxzPQaPeifu+lEdiL/uS5I3OFHoT7V9cMoNTL1Eh2hDU6rI062AQmXgxqVDtprPa5yP4xfPxyLxm66Y94w7yMMkR7nebi/geXKnJIlNuxGY7YCyM0i3phKJ46PTo/5k/fE3Z1gh41QNFWVYgrp0wK1Q3UtpA4WVooiBI8rfBtarOQs/7uQiXF98jRkCjaLxpv7Edgcm/FEYt3230CFrIN05LNQBmcXc4i5smHIINfcK+4hAeEW/PG8VjtLa2GEKPv+ZUlvNjefiMQm5tQqkiezYc4k9gqE06rsuSwcUpz4kN3y9Eer+DB9XSOONte1ELXDucliKPAXy+0oOD/XJjVfD1HxMwY0sfQkviu6CmfynRoG3ku306mJdnD9NK3uVNibUPQHERhCxTaZjdsPXO 4GQUv5f2 Jhh5bzeeWCm1PhgqUukieDQVwqFBpuYomLowdyALYlCnc4aaFIBJ9G75KTSeiM+s2PyniOuIFOKAmtCTRFjlECvKd2Dcv7Z+j89jxmiMo5YeM5BnWD30nEucn5R/nyU3AAJs6iAhqhQULOiIUpqVdudhAeQ+th+HsKUOUk8nkOAvIFvyvxQG92l1zL3NjhOLgWdjkf/K8NtpgyraGKWVvM5tFtRGqLrgGTFiqMWD+1PXeDKp/jAi6vizxRWwpTJxf0k7bEvbRkmMwtQWYCI9fMJno9XrbPTmDBQl3SE+d4JxSTGmmgbnntMwVeNVgCKpcclptBX7Ps3W1XzUdkczLjk6lOBMRGehS14B+vnXtZcWTblNsLwUqt4V2WCJUviu5wrRlbnRDZtQyGE8BAfMpmTcdLQ== 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: From: Tycho Andersen In the previous patch we've defined a couple behaviors: 1. execveat(fd, AT_EMPTY_PATH, {"foo"}, ...) should render argv[0] as /proc/pid/comm 2. execveat(fd, AT_EMPTY_PATH, {NULL}, ...) should keep the old behavior of rendering the fd as /proc/pid/comm and just to be sure keeps working with symlinks, which was a concern in [1], I've added a test for that as well. The test itself is a bit ugly, because the existing check_execveat_fail() helpers use a hardcoded envp and argv, and we want to "pass" things via the environment to test various argument values, but it seemed cleaner than passing one in everywhere in all the existing tests. Output looks like: ok 51 Check success of execveat(6, 'home/tycho/packages/...yyyyyyyyyyyyyyyyyyyy', 0)... # Check execveat(AT_EMPTY_PATH)'s comm is sentinel ok 52 Check success of execveat(9, '', 4096)... # Check execveat(AT_EMPTY_PATH)'s comm is sentinel ok 53 Check success of execveat(11, '', 4096)... # Check execveat(AT_EMPTY_PATH)'s comm is 9 [ 25.579272] process 'execveat' launched '/dev/fd/9' with NULL argv: empty string added ok 54 Check success of execveat(9, '', 4096)... [1]: https://lore.kernel.org/all/20240925.152228-private.conflict.frozen.trios-TdUGhuI5Sb4v@cyphar.com/ Signed-off-by: Tycho Andersen --- v4: fix up commit message, use ksft_perror() vs perror(), Shuah --- tools/testing/selftests/exec/execveat.c | 77 ++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/exec/execveat.c b/tools/testing/selftests/exec/execveat.c index 071e03532cba..3a05f8cbd815 100644 --- a/tools/testing/selftests/exec/execveat.c +++ b/tools/testing/selftests/exec/execveat.c @@ -23,9 +23,11 @@ #include "../kselftest.h" -#define TESTS_EXPECTED 51 +#define TESTS_EXPECTED 54 #define TEST_NAME_LEN (PATH_MAX * 4) +#define CHECK_COMM "CHECK_COMM" + static char longpath[2 * PATH_MAX] = ""; static char *envp[] = { "IN_TEST=yes", NULL, NULL }; static char *argv[] = { "execveat", "99", NULL }; @@ -237,12 +239,36 @@ static int check_execveat_pathmax(int root_dfd, const char *src, int is_script) return fail; } +static int check_execveat_comm(int fd, char *argv0, char *expected) +{ + char buf[128], *old_env, *old_argv0; + int ret; + + snprintf(buf, sizeof(buf), CHECK_COMM "=%s", expected); + + old_env = envp[1]; + envp[1] = buf; + + old_argv0 = argv[0]; + argv[0] = argv0; + + ksft_print_msg("Check execveat(AT_EMPTY_PATH)'s comm is %s\n", + expected); + ret = check_execveat_invoked_rc(fd, "", AT_EMPTY_PATH, 0, 0); + + envp[1] = old_env; + argv[0] = old_argv0; + + return ret; +} + static int run_tests(void) { int fail = 0; char *fullname = realpath("execveat", NULL); char *fullname_script = realpath("script", NULL); char *fullname_symlink = concat(fullname, ".symlink"); + char fd_buf[10]; int subdir_dfd = open_or_die("subdir", O_DIRECTORY|O_RDONLY); int subdir_dfd_ephemeral = open_or_die("subdir.ephemeral", O_DIRECTORY|O_RDONLY); @@ -389,6 +415,15 @@ static int run_tests(void) fail += check_execveat_pathmax(root_dfd, "execveat", 0); fail += check_execveat_pathmax(root_dfd, "script", 1); + + /* /proc/pid/comm gives argv[0] by default */ + fail += check_execveat_comm(fd, "sentinel", "sentinel"); + /* /proc/pid/comm gives argv[0] when invoked via link */ + fail += check_execveat_comm(fd_symlink, "sentinel", "sentinel"); + /* /proc/pid/comm gives fdno if NULL is passed */ + snprintf(fd_buf, sizeof(fd_buf), "%d", fd); + fail += check_execveat_comm(fd, NULL, fd_buf); + return fail; } @@ -415,9 +450,13 @@ int main(int argc, char **argv) int ii; int rc; const char *verbose = getenv("VERBOSE"); + const char *check_comm = getenv(CHECK_COMM); - if (argc >= 2) { - /* If we are invoked with an argument, don't run tests. */ + if (argc >= 2 || check_comm) { + /* + * If we are invoked with an argument, or no arguments but a + * command to check, don't run tests. + */ const char *in_test = getenv("IN_TEST"); if (verbose) { @@ -426,6 +465,38 @@ int main(int argc, char **argv) ksft_print_msg("\t[%d]='%s\n'", ii, argv[ii]); } + /* If the tests wanted us to check the command, do so. */ + if (check_comm) { + /* TASK_COMM_LEN == 16 */ + char buf[32]; + int fd, ret; + + fd = open("/proc/self/comm", O_RDONLY); + if (fd < 0) { + ksft_perror("open() comm failed"); + exit(1); + } + + ret = read(fd, buf, sizeof(buf)); + if (ret < 0) { + ksft_perror("read() comm failed"); + close(fd); + exit(1); + } + close(fd); + + // trim off the \n + buf[ret-1] = 0; + + if (strcmp(buf, check_comm)) { + ksft_print_msg("bad comm, got: %s expected: %s", + buf, check_comm); + exit(1); + } + + exit(0); + } + /* Check expected environment transferred. */ if (!in_test || strcmp(in_test, "yes") != 0) { ksft_print_msg("no IN_TEST=yes in env\n");