From mboxrd@z Thu Jan 1 00:00:00 1970 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 B50F0C3ABC9 for ; Fri, 9 May 2025 19:01:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D5BD76B00A0; Fri, 9 May 2025 15:01:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CE5326B00B9; Fri, 9 May 2025 15:01:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B69A66B00BA; Fri, 9 May 2025 15:01:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 912F96B00A0 for ; Fri, 9 May 2025 15:01:27 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 602441A0429 for ; Fri, 9 May 2025 19:01:28 +0000 (UTC) X-FDA: 83424287856.20.F02CB39 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf01.hostedemail.com (Postfix) with ESMTP id ECCFE4000B for ; Fri, 9 May 2025 19:01:26 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ASCU+MKM; spf=pass (imf01.hostedemail.com: domain of kees@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=kees@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746817287; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=fzlzb3bYQK8IH+PIAFuWPxHytp71Qowgnm2iRr69xV4=; b=io636fE5O0sIymLwZM7SDlXwdH8B6fGU1tTyXFIPE3rgUk4LF2WzvaO+w8hy8Xkl0FirMH gAd2rWqDCaia5ydkc7B9v8k6Xc9yMR9/FT9FodViy5iK+9gQvynTbl9dYXFPlhybgRa75G 0E1QIelDNlx2cAwqQAGw2T7yD/6fpxc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746817287; a=rsa-sha256; cv=none; b=PKEz4VxnGVD0gFomE+FEl4Ekot1r52QDMFM1dHvQrDpFjdiOCYgR0Iq1hUbH68mRMbEHYg JkAcxVG/+OZcu6ao1ijI5zG4gdiZkelje/DC7uN31hG6yCCcbI2fdCfWnFjJ0UiHxlMzbA BGT2moqYo0zENuAewCBad7llUeq94wc= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ASCU+MKM; spf=pass (imf01.hostedemail.com: domain of kees@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=kees@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 6AC5EA4AAD2; Fri, 9 May 2025 19:01:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3397C4CEE9; Fri, 9 May 2025 19:01:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746817286; bh=akbEbL1UVIv55uwYZyCLqwKBc4CH9+Dt5Oh8Z2+LGg4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ASCU+MKMY+5fj8xnGHpAf+qHr+WP+BQJimdKR2SUdXCZprN/m18ScjHOTwr+Kv2ms vU4Cr4UtBLeL/IizRm/1tvQzf8fdKn+XCXZ/Tm3cUaY823LAJ6u8rb79eJEmrSZvdG 6SxD677NiUuRZzQQJxTVf2BT7ii0Aa6OiMOokKJ0L2M/pHglOcqCfTJntdkim8rzew kuuexECDIzoD8MEF9aPuzhEjSwJUWDkMDy1R+0+7jawNqWQ+u8MeLePmbhevoIBHSX Gkx9rxQC9jFKY9d3UvCu3W323e8viGtRWCf/Nn7L0+bLhRkH/qyT86s50EwWZZoLJz xNDlsfUB9m7HQ== Date: Fri, 9 May 2025 12:01:24 -0700 From: Kees Cook To: Joel Granados Cc: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby , linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org Subject: Re: [PATCH 09/12] sysctl: move cad_pid into kernel/pid.c Message-ID: <202505091200.FC2683DD@keescook> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> <20250509-jag-mv_ctltables_iter2-v1-9-d0ad83f5f4c3@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-9-d0ad83f5f4c3@kernel.org> X-Stat-Signature: 9gdahahxuamwkfngmbx8zqimcmm94w3k X-Rspamd-Queue-Id: ECCFE4000B X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1746817286-874344 X-HE-Meta: U2FsdGVkX18r5hWSTSSEFVo7l/5hj7OEJ3tpS8+ZtRirs37moHh+t5XlMpFt1QX2knnpWb1OBNLp6qt14Q9mknAYx23ywLJ+hNlAVjtCQ09ryt/wZCrd0m9tWa00jhkxshNAZz4fU0kThytY4uDRKyZDh7FtQTZFyJBImCz7m1kdMXP986zA8rzkU+/qZXkXs52ssrusxdMITDwpzH0229gebC2K1PbBtt28xPcz2L5HCoh8DKBdvuwfTKqyqPDfQco+oWGZPeal5pf6YlU0LONLQ5wZQmojfKwd6QV6XYOI5pOKydbBQ8OKiDDXHq8bMB9Dhhv8xYeMUA1s3gslJvUdOK9aImABHnxuZupiwiD2nW0jwg18wgHm5Vo2SyZ9KpznbDRXCWbpLLU3sQySgxBTHlo8a56CI9UB/kpRHYjcuOSnJbSESYU7au/KtnaSG76PV6qqkQk5h6s8tvwLRnyu9PYZSUnV+RjSa5Km2RUWuq1mEOx24zcnCKNsyKRYfizS0qkhXXcwst7UJLdvWo7Vp8ogCQf1zMgDqtRaBmjkegpxohKRTlnfpy22f/IUd9HAuJjVKgBGKfOXm4Hz28wL1mZu+c9GNL5NobfSQX6k8XQhSYK4lUXiUfy+ULLPVtfZYqi2+izPX+0bhdHMEX8B+4uk1MTxUKtje7omB5lKVhD5QDi2QqFoEXI4cyuMp7GN7zLbRGPAKXvATaYj0JIEjViH1XHZ80TYJHmWuL6907RkIRO0R25KtdoPiZqCXh82NliQracE9JB//SwbwcGxpQqX6q4u9GpNB74P6/Afx4KGMLEKKG82N0pvQVvNLoicq70daHaTwZvDqVMLQ6eb//hb5becwzJS5xOZtgQjfPyUxLc76olyIJv/joZjoSU3Jk5fPQlNAT12jjUwKH8HPiH8D7k7shfvQCvNN+X2oHH/4tPLLBl6Bq1dhEdPlIpgUwcLVb4wNy9SVYv dKk1MAX0 C+prkqrS3gpKTGnnIesAOeJbJ32SVXcyTinEyNxGXoz7JMhhQH4yHDa5SuQZcFk/Cew6CyHj7fxWq0+I= 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: On Fri, May 09, 2025 at 02:54:13PM +0200, Joel Granados wrote: > Move cad_pid as well as supporting function proc_do_cad_pid into > kernel/pic.c. Replaced call to __do_proc_dointvec with proc_dointvec > inside proc_do_cad_pid which requires the copy of the ctl_table to > handle the temp value. > > This is part of a greater effort to move ctl tables into their > respective subsystems which will reduce the merge conflicts in > kernel/sysctl.c. > > Signed-off-by: Joel Granados > --- > kernel/pid.c | 32 ++++++++++++++++++++++++++++++++ > kernel/sysctl.c | 31 ------------------------------- > 2 files changed, 32 insertions(+), 31 deletions(-) > > diff --git a/kernel/pid.c b/kernel/pid.c > index 4ac2ce46817fdefff8888681bb5ca3f2676e8add..bc87ba08ae8b7c67f3457b31309b56b5d90f8c52 100644 > --- a/kernel/pid.c > +++ b/kernel/pid.c > @@ -717,6 +717,29 @@ static struct ctl_table_root pid_table_root = { > .set_ownership = pid_table_root_set_ownership, > }; > > +static int proc_do_cad_pid(const struct ctl_table *table, int write, void *buffer, > + size_t *lenp, loff_t *ppos) > +{ > + struct pid *new_pid; > + pid_t tmp_pid; > + int r; > + struct ctl_table tmp_table = *table; > + > + tmp_pid = pid_vnr(cad_pid); > + tmp_table.data = &tmp_pid; > + > + r = proc_dointvec(&tmp_table, write, buffer, lenp, ppos); > + if (r || !write) > + return r; > + > + new_pid = find_get_pid(tmp_pid); > + if (!new_pid) > + return -ESRCH; > + > + put_pid(xchg(&cad_pid, new_pid)); > + return 0; > +} > + > static const struct ctl_table pid_table[] = { > { > .procname = "pid_max", > @@ -727,6 +750,15 @@ static const struct ctl_table pid_table[] = { > .extra1 = &pid_max_min, > .extra2 = &pid_max_max, > }, > +#ifdef CONFIG_PROC_SYSCTL > + { > + .procname = "cad_pid", > + .data = NULL, nit: this is redundant, any unspecified member will be zero-initialized. Regardless: Reviewed-by: Kees Cook > + .maxlen = sizeof(int), > + .mode = 0600, > + .proc_handler = proc_do_cad_pid, > + }, > +#endif > }; > #endif > > diff --git a/kernel/sysctl.c b/kernel/sysctl.c > index 9d8db9cef11122993d850ab5c753e3da1cbfb5cc..d5bebdd02cd4f1def7d9dd2b85454a9022b600b7 100644 > --- a/kernel/sysctl.c > +++ b/kernel/sysctl.c > @@ -1224,28 +1224,6 @@ int proc_dointvec_ms_jiffies(const struct ctl_table *table, int write, void *buf > do_proc_dointvec_ms_jiffies_conv, NULL); > } > > -static int proc_do_cad_pid(const struct ctl_table *table, int write, void *buffer, > - size_t *lenp, loff_t *ppos) > -{ > - struct pid *new_pid; > - pid_t tmp; > - int r; > - > - tmp = pid_vnr(cad_pid); > - > - r = __do_proc_dointvec(&tmp, table, write, buffer, > - lenp, ppos, NULL, NULL); > - if (r || !write) > - return r; > - > - new_pid = find_get_pid(tmp); > - if (!new_pid) > - return -ESRCH; > - > - put_pid(xchg(&cad_pid, new_pid)); > - return 0; > -} > - > /** > * proc_do_large_bitmap - read/write from/to a large bitmap > * @table: the sysctl table > @@ -1541,15 +1519,6 @@ static const struct ctl_table kern_table[] = { > .mode = 0644, > .proc_handler = proc_dostring, > }, > -#endif > -#ifdef CONFIG_PROC_SYSCTL > - { > - .procname = "cad_pid", > - .data = NULL, > - .maxlen = sizeof (int), > - .mode = 0600, > - .proc_handler = proc_do_cad_pid, > - }, > #endif > { > .procname = "overflowuid", > > -- > 2.47.2 > > -- Kees Cook