From patchwork Tue Oct 1 13:49:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tycho Andersen X-Patchwork-Id: 13818043 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 CE901CEACC3 for ; Tue, 1 Oct 2024 13:59:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 190A928008B; Tue, 1 Oct 2024 09:59:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 14128280068; Tue, 1 Oct 2024 09:59:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EFC9128008B; Tue, 1 Oct 2024 09:59:32 -0400 (EDT) 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 D272E280068 for ; Tue, 1 Oct 2024 09:59:32 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 88F141413EC for ; Tue, 1 Oct 2024 13:59:32 +0000 (UTC) X-FDA: 82625190984.26.6FB1DBD Received: from fhigh-a2-smtp.messagingengine.com (fhigh-a2-smtp.messagingengine.com [103.168.172.153]) by imf02.hostedemail.com (Postfix) with ESMTP id 85DDB80018 for ; Tue, 1 Oct 2024 13:59:29 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=tycho.pizza header.s=fm1 header.b=pssqwj07; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=QjjWVV9R; dmarc=none; spf=pass (imf02.hostedemail.com: domain of tycho@tycho.pizza designates 103.168.172.153 as permitted sender) smtp.mailfrom=tycho@tycho.pizza ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1727791130; a=rsa-sha256; cv=none; b=WewLDgGmYSq8ihZdHOzrwbLh/+6ZNynpgirMFTfp1tjmIQ3yFEGKXZZBQCCbVzrzHoxJqS ngzRtwXgV52jeyIEK6FbXDvnAZBidSgBGXNIoPyAlf8RiIPZX1WUqFjuH4srg0LuvJyjvZ NNxS7POkAuBhQUtGFmLrDzEmmQs/5YA= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=tycho.pizza header.s=fm1 header.b=pssqwj07; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=QjjWVV9R; dmarc=none; spf=pass (imf02.hostedemail.com: domain of tycho@tycho.pizza designates 103.168.172.153 as permitted sender) smtp.mailfrom=tycho@tycho.pizza ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1727791130; 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-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=unWHvxzfAjnkbvBw6nviBvkFZdeAWYaudeSrxpKDykw=; b=HvqFiLvw2IASYV6f2ZUfiycSZF7Ehqu6I4Y1pPBwluGtn9sf/6RuG4/dKxDczSLijLFXdi Gf9VEz2aXQyr4810sxxx1Zu0Zu3HPHykTW9Sg9Cv5JzdAf/XIYnvKj3tFqVl3Stzl6eY/1 bpqo3k64ATjFMfJ/lK0hv4Oqrw9chd8= Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfhigh.phl.internal (Postfix) with ESMTP id DFD5C11413D4; Tue, 1 Oct 2024 09:59:28 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-02.internal (MEProxy); Tue, 01 Oct 2024 09:59:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tycho.pizza; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm1; t=1727791168; x=1727877568; bh=un WHvxzfAjnkbvBw6nviBvkFZdeAWYaudeSrxpKDykw=; b=pssqwj0736RHy3+h8m 0rW29eeT5N3DbwuJBw1egM7Jjjc8JjdGG8vx1Ms7Xx5MkG1syA6O9bdMbu/Qy0jX YoXPpYjN+3JYkz8KMeorIj7ZoWYCzowGHmHbSPvqjQzUGlzFg6ZFfc08BALSydfd mUrDSvLBkxlMhz3JfZPGnsDAgWjIEFag5S3c4XRoCuY0W8V8T8uywY1ULsUf+enq kjUDG8D62/rDZCa4+RCTfGB19a0RoW457RICZH5hXv5vpbihyFiv5p4kwYWGULFv aSEtHAX6VFjv64CpnrSVnM/Im5rL+Fa50fRFZYn8ejVNPZK7zjnSUa2pef7tFDS2 OXrA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1727791168; x=1727877568; bh=unWHvxzfAjnkb vBw6nviBvkFZdeAWYaudeSrxpKDykw=; b=QjjWVV9RrX987qwDX3uubrLJfXsqg DP4OQoVXPMPQzhVneNE0+/RCGI4dXokMK9466jOOOn7cIT9rm0te+0pFqHQJ1fkF WJQsqt18bSPcVRtTmJ3vWLet3AOXl1uTfvNxi4800LKxThOasWAWqZgMSe42GMt3 LOeJ+8aTU1G5uZxc5ExrkcClBoSTMsaFUVSyO/K5mnkZR6MQybrtdsTwrp6qe1Kg XveebKSycxyaOwqFUoKd+aKvemAZnzWIUoSj3eggaOb2vEF/UX0n9aiTCYJDTsdI 17+41DpSmVpt8nGn0JeNzilo4B50h/gmHPpUxFmKwOTzZI39WERZTe2Lw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvddujedgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecu hfhrohhmpefvhigthhhoucetnhguvghrshgvnhcuoehthigthhhosehthigthhhordhpih iiiigrqeenucggtffrrghtthgvrhhnpeeuueeujeffffekheevvdeiudffgfdtteevuddv tefhgeduffehuddvjeffhffgueenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuve hluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepthihtghhohes thihtghhohdrphhiiiiirgdpnhgspghrtghpthhtohepudefpdhmohguvgepshhmthhpoh huthdprhgtphhtthhopehvihhrohesiigvnhhivhdrlhhinhhugidrohhrghdruhhkpdhr tghpthhtohepsghrrghunhgvrheskhgvrhhnvghlrdhorhhgpdhrtghpthhtohepjhgrtg hksehsuhhsvgdrtgiipdhrtghpthhtohepvggsihgvuggvrhhmseigmhhishhsihhonhdr tghomhdprhgtphhtthhopehkvggvsheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoheplh hinhhugidqfhhsuggvvhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthho pehlihhnuhigqdhmmheskhhvrggtkhdrohhrghdprhgtphhtthhopehlihhnuhigqdhkvg hrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehlihhnuhigqdhk shgvlhhfthgvshhtsehvghgvrhdrkhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i21f147d5:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Oct 2024 09:59:27 -0400 (EDT) From: Tycho Andersen To: Alexander Viro , Christian Brauner , Jan Kara , Eric Biederman , Kees Cook Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Tycho Andersen , Tycho Andersen , =?utf-8?q?Zbigniew_J=C4=99drzejewski-Szmek?= , Aleksa Sarai Subject: [PATCH v3 1/2] exec: fix up /proc/pid/comm in the execveat(AT_EMPTY_PATH) case Date: Tue, 1 Oct 2024 07:49:44 -0600 Message-Id: <20241001134945.798662-1-tycho@tycho.pizza> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 85DDB80018 X-Rspamd-Server: rspam01 X-Stat-Signature: 49hz5pa8ufjg7ab8t9ondiis1rzj8usi X-HE-Tag: 1727791169-624734 X-HE-Meta: U2FsdGVkX18C5Z746e1BtpjnAoB3eeNSJvoplvKGVGXwFMpeUyhA7bHQH65pAcwUie1nocuQZQSYlfm+xvsDetsD8wNsVTMV+2MEcDD4Kg/YUJu1b3Dn91sFsTeMSgODVJ3lugwoPUmlQdUT/oIIqI1KFZto+wEWMp3MfVrBVFNN45eOCNCt7nWg+KSTg/9B1uRWopvi1oxIgbATYYV25kkRhRmYnVSP+57zTMEl1GEezSWyvjHM2FG3v/5yDrHHC2g4DX+xfMp76gHuH2OdQPSusmJ/mrmRkW87JO5vB3pTAD6tG3IaFqtmEU/fLm+XvYLRaohEMazUCVSkCWj6tBDf6L6QXYwVM71J5DqGRKjwEigNoI+hDC/q3o2Bww4i3mueZUyP7RYJotFLjHIYTEfoWPWFng34rrD36WxH5b/o521K5DqzMdoVU38C0M3YJPMWaZ5mqYVUdheLZH9eezOb/uaMLt/g8CFPk0Mkk77D0uAie/OAjs/JRypiA6OQFqw38xRF5WawZADoUJ2neoQ3BDw+MMwAynbtak+dtLWa/095yo5Oi05pK85XmnTva18eB5S7KAow9L4MCqaeAy7ugrfw+kRqh1De1W+EVZ1JHvYLxpAjemkj0OMsbK28CT8N+19TKjOTQvU4IKl4U/sxSULJrUjtvqh3uaGmfSjOwro/nD17n5AVaSey8rXROLchGhSEpcTM0AoJAI4gO18cJ4c6pLlySxT3apCSvvh0hKiBlxklzJILT+HFAzTTyz25ojHnlItWqePpH+M1eluKLZtmjPakSdZ63sGyBAJXVIHSQOSrwyGY8zkH127fMuJpu3cDwOv3zH/D80axH0BZUcKkTOyJP7Lsjtc0mNa5h4jwYTmiyskpNpDJ6iIPp9ZM1mnZKXj++m6u+2UyaXXZV7KWoiQJjV3tiDBhtqbRZ98zaRtvvJ+WOvk4jXb+yoz3wQDGkUrUwVgZ1wM SthtEccT 981iDDD9uK/YSRs3MdxIzbvTirStrUG2jR6WF1D7sa9W2GSdYD7/APP2EGDwIEiKzgnKkxNZnZ3D8kuijxeCn0ba/5bLDOK/KsuSg7vND2fADOwWvP6LTLuPvVaVMQQchmVOlk5M43eE+NBDhu+RYVk/yhHXgVv9VqKBNsaLeJnPvqguS/hUhdhzOu7t+DkizPAAO6sjk+wn2LSR9K+O0Y+2mGywbXzRF3GRemcfrRnmXMouMxiZaqb+hUIzCh43Olgv03ctxijsZkfiw1CxcMW4pBf+d1p2CwSgwUvj7zapd5E10nnhRLy2eXuO9+FT5dYr2yVDWSNJAKt3APQjqb95nQR6iv/JVpGesXbPMKByQup7yxqVZ3a57E0mv+9dp6AU/Vwyv9Fv2xlTfyEOVcCeIcET58B4D25g3z88TaFiS9jCHezjNxoaj9sHdprmsCOMx 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 Zbigniew mentioned at Linux Plumber's that systemd is interested in switching to execveat() for service execution, but can't, because the contents of /proc/pid/comm are the file descriptor which was used, instead of the path to the binary. This makes the output of tools like top and ps useless, especially in a world where most fds are opened CLOEXEC so the number is truly meaningless. Change exec path to fix up /proc/pid/comm in the case where we have allocated one of these synthetic paths in bprm_init(). This way the actual exec machinery is unchanged, but cosmetically the comm looks reasonable to admins investigating things. Signed-off-by: Tycho Andersen Suggested-by: Zbigniew Jędrzejewski-Szmek CC: Aleksa Sarai Link: https://github.com/uapi-group/kernel-features#set-comm-field-before-exec Reviewed-by: Aleksa Sarai --- v2: * drop the flag, everyone :) * change the rendered value to f_path.dentry->d_name.name instead of argv[0], Eric v3: * fix up subject line, Eric --- fs/exec.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) base-commit: baeb9a7d8b60b021d907127509c44507539c15e5 diff --git a/fs/exec.c b/fs/exec.c index dad402d55681..9520359a8dcc 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1416,7 +1416,18 @@ int begin_new_exec(struct linux_binprm * bprm) set_dumpable(current->mm, SUID_DUMP_USER); perf_event_exec(); - __set_task_comm(me, kbasename(bprm->filename), true); + + /* + * If fdpath was set, execveat() made up a path that will + * probably not be useful to admins running ps or similar. + * Let's fix it up to be something reasonable. + */ + if (bprm->fdpath) { + BUILD_BUG_ON(TASK_COMM_LEN > DNAME_INLINE_LEN); + __set_task_comm(me, bprm->file->f_path.dentry->d_name.name, true); + } else { + __set_task_comm(me, kbasename(bprm->filename), true); + } /* An exec changes our domain. We are no longer part of the thread group */