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 333C1C3ABC3 for ; Fri, 9 May 2025 17:10:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 587D46B00BD; Fri, 9 May 2025 13:10:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 535066B00BE; Fri, 9 May 2025 13:10:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3AD466B00BF; Fri, 9 May 2025 13:10:33 -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 1BA306B00BD for ; Fri, 9 May 2025 13:10:33 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D8D5D140284 for ; Fri, 9 May 2025 17:10:34 +0000 (UTC) X-FDA: 83424008388.27.CB17FFA Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf12.hostedemail.com (Postfix) with ESMTP id 3833440006 for ; Fri, 9 May 2025 17:10:33 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=EgcJs+2g; spf=pass (imf12.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=1746810633; 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=Y+VYS9R5II8LWNqd5hlcjQqMSXH+BD87N42ufCxW1kg=; b=z/sJgWXjQs6+rjhqikuuT3v51IjkVyfnpI3P4ji+5jenw7rcPl/y+NLVE8grnK5XqoYHbq 1FUUxtxmlTap6ipfhBDMdANWvUsV7A2CfMTiazFwcLE0DNEzn+sXG8bCghaCtjHSnsCJ3D 1pRaxEwt+IgfKITu55VlG0Dx3BVmkFU= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=EgcJs+2g; spf=pass (imf12.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746810633; a=rsa-sha256; cv=none; b=ANnqMzG7Mxrd0cnKMO17kECyVAuq2lC5XuhJt0K0FgqJlNMOwdvsQuYN7BzjwrbwOUIuPQ qttCwi/g5NQQTEXJh6t4A4NlvgWDxsmlTSUAFU48KBQP5ALO+vLZ9SHjWiURWxchBFrUV0 Fq/LHN8wZ+to4tHjcjnC7Ki38EkATn8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 7185FA4CBC6; Fri, 9 May 2025 17:10:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01317C4CEE4; Fri, 9 May 2025 17:10:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746810632; bh=Rg26xVepbKv+GhXzyO57+ntaAAUnjE9KukxV2nugKoU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=EgcJs+2gmQcQQRtPJko2aZpyTLaujeLaSLfxYN4PC77ilDL+fivFo95iZkjr2coCg x3R30fiwAmxHH9wGoQbqyklQqyRuT8riDJwThw+sKP4ZJCefANJEyCG4aeCAvpMWtf aCqWWPayvy8jp1rXDkjzswwulALDGa5NPOGL7euPyopTMMr/9a4W6YEX8zGMD/Y7e7 G9tXQcmIUIi/Rf6SjgTsAQNdCHMtrfmMRHO6GqKSKT4HrZIRz6LtaPFMZ8ZefKa48L mBq/mDOO2dQ2h1QiRWRllwyWGZeY/14OeTnRo0sOh6CwDm4Ur1Gfwauj6fpVIYY6rs vopmEhIyNh3Bg== Date: Fri, 9 May 2025 10:10:28 -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 07/12] Input: sysrq: mv sysrq into drivers/tty/sysrq.c Message-ID: <202505091010.F2F8C676@keescook> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> <20250509-jag-mv_ctltables_iter2-v1-7-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-7-d0ad83f5f4c3@kernel.org> X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 3833440006 X-Stat-Signature: mybp4raq4oyszi3jdrfzqkab1ft8omfq X-HE-Tag: 1746810633-377251 X-HE-Meta: U2FsdGVkX19v1Q67zsH4KCZkq7v0oGnc77rqNuix2rtDB/Uc5ZD70zfmQBrGNuCwuRo/OJsRWm7NC8AWNsrj8CeuQa/M1jx4a+LF0AUs9S/TXOfN7gDgDBXlpUMc8cnMskImcisLss4SaqCIsvhLT0GO1VF6GUsS6+Ff1LaX0MT6XJGkSMlasMcVrTKx5xLrwwnvpfh1D5WAsA8B7J3cUytvluy20ll8MuH/RA52OAG739Rh+vob/xkpq9Zu96Wrep8Extkf6V84/x/Ri3TPvCzoaDSubiVd6abiQYi1nlFaggi+Bc8xBAE3LWARzX3kN4uycIMCslabrecMpwgYPi7LjKVkdkgfb6ziMC6RyhYo2X/fcpuXtX6zWFWheI/aoCX+SJHpnxbLY030M1f2U0bMhHkByincIYnCynWjcRoaKpLfaONOo9XAVteCGI1FJNYWExuKF1r1GxsOng79kL1EOPgSXHeRrWFLcm+aXMlfpYmweEyyjQh63x+fjpnMckK4GSr3QWnYQZzEcDcABvsGV2u+4e6wI5aQrfX6qvmcFdFvKFSTA+9/hO/PUuygGgUNKCmPf2i4H6MtW3kz8i81I+9jhX2yBDQIdF6EIoQQ+mfcfI2Ivdyjmv+JeopPrrZTWZvOBTvO6LlArryz7GdVbMTzvKt0OxWZMFF+Ev93foReKsUDyNz6QEuPcB7vj+0Lqsg9PbGy0KZCxCPSir/Un1KOdrBDIdZ1Wo3bEXlyMTOaxzIpjj+MRdNIk1DZIzRwhGKR2mYnwd9oMunNVDyaAocF4BhBwZhvogEunGQ8ZC8C1mH6rJWrGLHQbKMEdPsfOfZ1hbjQ98tyX1XnEYZ9uJ0Nmlkf28dZ/HnDJj+7DQjHQQe7IZ99u0R2bIWNOjba7dkRacOZix7sfuXTqiApPaa7iz8Dbf7C3rxCWg+OxOAW6GFRf9yKIu4h+TOpNSm7SG4g2bgoy+5t4ph Oa15n2JS bkdkqg08VvjKh5oTWFwCMLIozvg0EXx6bRr7PC2xdzskMcEUVikuJfWuxwUwGi7Kt1wg/lodrN9uQeXvMyTElPWFWp1Zc/MKyI4stmh8guxN2jCr98RFFv7ULtOMftL5SOEimvNyzLtq1fAdZ5vF11CFge/eCsGhuJMEC6lY3rbFSwXuEbKPx/JSq9dD5UAoRHXrVtmuECUKFcEF8cvpJp4h3LimJI7iLgRUwcGsCt+ZJK8VRx8dOvad9S5k63vc1x8XII4VYjw8BQ6sKbu6Fs72wQFjSPXwKs+kpBQuII+dpbbTU+eGgA3KMeTIniLP9N6Px4uDxL2y7gIz/1hxC4108iu/Vlfcu2Vnj3PqGTx3cw3zeTbjoF8RFdgmVKE78nHNh 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:11PM +0200, Joel Granados wrote: > Move both sysrq ctl_table and supported sysrq_sysctl_handler helper > function into drivers/tty/sysrq.c. Replaced the __do_proc_dointvec in > helper function with do_proc_dointvec as the former is local to > kernel/sysctl.c. nit: do_proc_dointvec_minmax > > 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 But yes, this looks correct. Reviewed-by: Kees Cook -Kees > --- > drivers/tty/sysrq.c | 38 ++++++++++++++++++++++++++++++++++++++ > kernel/sysctl.c | 30 ------------------------------ > 2 files changed, 38 insertions(+), 30 deletions(-) > > diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c > index 6853c4660e7c2586487fea83c12f0b7780db1ee1..8a304189749f3e33af48141a1aba5e456616c7de 100644 > --- a/drivers/tty/sysrq.c > +++ b/drivers/tty/sysrq.c > @@ -1119,6 +1119,44 @@ int sysrq_toggle_support(int enable_mask) > } > EXPORT_SYMBOL_GPL(sysrq_toggle_support); > > +static int sysrq_sysctl_handler(const struct ctl_table *table, int write, > + void *buffer, size_t *lenp, loff_t *ppos) > +{ > + int tmp, ret; > + struct ctl_table t = *table; > + > + tmp = sysrq_mask(); > + t.data = &tmp; > + > + ret = proc_dointvec_minmax(&t, write, buffer, lenp, ppos); > + > + if (ret || !write) > + return ret; > + > + if (write) > + sysrq_toggle_support(tmp); > + > + return 0; > +} > + > +static const struct ctl_table sysrq_sysctl_table[] = { > + { > + .procname = "sysrq", > + .data = NULL, > + .maxlen = sizeof(int), > + .mode = 0644, > + .proc_handler = sysrq_sysctl_handler, > + }, > +}; > + > +static int __init init_sysrq_sysctl(void) > +{ > + register_sysctl_init("kernel", sysrq_sysctl_table); > + return 0; > +} > + > +subsys_initcall(init_sysrq_sysctl); > + > static int __sysrq_swap_key_ops(u8 key, const struct sysrq_key_op *insert_op_p, > const struct sysrq_key_op *remove_op_p) > { > diff --git a/kernel/sysctl.c b/kernel/sysctl.c > index febf328054aa5a7b2462a256598f86f5ded87c90..ebcc7d75acd9fecbf3c10f31480c3cb6960cb53e 100644 > --- a/kernel/sysctl.c > +++ b/kernel/sysctl.c > @@ -31,7 +31,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -964,26 +963,6 @@ int proc_dou8vec_minmax(const struct ctl_table *table, int write, > } > EXPORT_SYMBOL_GPL(proc_dou8vec_minmax); > > -#ifdef CONFIG_MAGIC_SYSRQ > -static int sysrq_sysctl_handler(const struct ctl_table *table, int write, > - void *buffer, size_t *lenp, loff_t *ppos) > -{ > - int tmp, ret; > - > - tmp = sysrq_mask(); > - > - ret = __do_proc_dointvec(&tmp, table, write, buffer, > - lenp, ppos, NULL, NULL); > - if (ret || !write) > - return ret; > - > - if (write) > - sysrq_toggle_support(tmp); > - > - return 0; > -} > -#endif > - > static int __do_proc_doulongvec_minmax(void *data, > const struct ctl_table *table, int write, > void *buffer, size_t *lenp, loff_t *ppos, > @@ -1612,15 +1591,6 @@ static const struct ctl_table kern_table[] = { > .proc_handler = proc_dostring, > }, > #endif > -#ifdef CONFIG_MAGIC_SYSRQ > - { > - .procname = "sysrq", > - .data = NULL, > - .maxlen = sizeof (int), > - .mode = 0644, > - .proc_handler = sysrq_sysctl_handler, > - }, > -#endif > #ifdef CONFIG_PROC_SYSCTL > { > .procname = "cad_pid", > > -- > 2.47.2 > > -- Kees Cook