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 6E9F0C3ABBC for ; Fri, 9 May 2025 12:55:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C5A8280018; Fri, 9 May 2025 08:55:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F054280029; Fri, 9 May 2025 08:55:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12685280018; Fri, 9 May 2025 08:55:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id E3265280026 for ; Fri, 9 May 2025 08:55:08 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 20425C0123 for ; Fri, 9 May 2025 12:55:10 +0000 (UTC) X-FDA: 83423364780.22.47BCA8D Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf03.hostedemail.com (Postfix) with ESMTP id 167122000E for ; Fri, 9 May 2025 12:55:07 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mn0hOIMP; spf=pass (imf03.hostedemail.com: domain of joel.granados@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=joel.granados@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=1746795308; 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:in-reply-to:references:references:dkim-signature; bh=s/+c6neEqCQEqXMonVYYtCYgUWcM3+lDsu2F7J6Ob48=; b=v66wbyfZZ35FNzgsbblCFF7LTefa1aBgKewdJv7s+ObALG3uZqAyPMducRlPlhplftn7Xg vhEcs64l+N1x+D/kf0/eMntjdlJD+UFGsg7YB3oKyaWEq0nSlhwZ1qM5OME5Q8RN4GiIm+ 1TPPA0Y1AsC5E8FPmv/gQSVyQ/tAAkA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mn0hOIMP; spf=pass (imf03.hostedemail.com: domain of joel.granados@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=joel.granados@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746795308; a=rsa-sha256; cv=none; b=Jn89XFi8WnHTauGd0hpj9T5UYnc+QlJDgZCU6CjMqT5Y66f89UsfPGTSVZ9ydvF0oiAB1H 5u1wBrna/jQMAr8dMoCGE9Fo5eWrlvPe81sICjZFPXFeWC28YfkDKjS3+XoS1XiE7FqBed mxQ96PZBplDXBtuYVBdWNHWa5P0qKi8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id A98B14A7E8; Fri, 9 May 2025 12:55:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 2C186C4CEF4; Fri, 9 May 2025 12:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795306; bh=gjjnyJtn9rL7qDVpBI4IReueEE8EroNg5ir0HoyLtas=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=mn0hOIMPYfURLIE/WU5fIJIHiX4VolQjVMoKxIu+HQh+eRbJ0wO6xyFasVQBiGp3V r+G/1tGi48JdnzT7P0hyZ9iRrBHzJNYBIWfFe/GWR8/uyv7jOBFwT3Tx8o1Fjb+4G6 OXJ37leqMjgXp2DuhHPwXw/W3aObh5xytEzvoLxqueL0PG5RcOT0QQRa0xA2uc5V4Y pKyCjqYW4O12XCx3YTcRIF9k5/gbftNa8Qfy7PWNxAqdSj1gtr4mXmwwek1oq5Q9im 7pcqPpfp4FfwrRpOOzYDG6McKp9VnCOXChrR8TypofBvL1es9qBz3zmo4hvlXqsL6o /xP69WDnQiHvg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2129FC3ABCE; Fri, 9 May 2025 12:55:06 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:12 +0200 Subject: [PATCH 08/12] sysctl: Move tainted ctl_table into kernel/panic.c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250509-jag-mv_ctltables_iter2-v1-8-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , 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 Cc: 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, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4205; i=joel.granados@kernel.org; h=from:subject:message-id; bh=gjjnyJtn9rL7qDVpBI4IReueEE8EroNg5ir0HoyLtas=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGgd+yV+rDKiq8+9lr4zAKfpivTW+aC7pXl3I dS7Tq9JQnWA5IkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfslAAoJELqXzVK3 lkFPrtML/3uwnHJ/JqfBMu/TvpbR4B0zarBGmD92mSCnMHyEC7u8Ky4liTEmME4Yom6MK0K76zM F5bzJ+uVqLmQV+HJgQcmNDmvMjkm5m6fWZAN5ggfV8CmJjF0ZKVN0dst/maCll9WOoj16rl4a2k 4IL6xjU9G+kxlwp6wT71cIKOgYEb9MizsBzW0ahDvcAS27PYeac8t6yFlHlXTAt8escrw26mY4A JNaiTbS0nnLhMIlBeIyuSChKqYpQdkapyKXTANQ5V8G+BgSDDrpuc1hDwdxKcDcQHafaaf7xiCN Syou4Df4mEoRHJ1Ex7TxMo7oTLSG0pK2uG9WpKOsi+was5ZsZeM266Vt+yB1DoKCIV706gib4v/ cHV/muDGo03g44TLEzvCXRyc86It1dvhL8lLagWQnKf2EDlW4FlsuDOIGdL83Lgqqm0VU6QFVBj krHSMOvq/fVRVFS4Xwic4GTsb7c6SmKfeTSza9mr4IkOlHnPjfw/Iv1SKJ8hqMZ67YsPmK2Y4F6 Mw= X-Developer-Key: i=joel.granados@kernel.org; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for joel.granados@kernel.org/default with auth_id=239 X-Stat-Signature: ywc91rz69cy6dp8pjd8xqe5fetj4qtor X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 167122000E X-Rspam-User: X-HE-Tag: 1746795307-469823 X-HE-Meta: U2FsdGVkX1/4vJ80S/dwBJyed8fuHYmuEhHuRQcPgmfvUdzKPoxLtdniUMgUuPQc30CJvlyaVPBn7dCMWVOb4JMSvYPMS29CnQEan2hPiYE69g49j6fDBYT4rZ3MIUdGbdt9ZFfftnCbRXoGvNlIsJ+D0aT6eaiq2oHcJRgxuAqBW2ImqhEhQG6w68ieFGS1IyloGjARtv1bnu4pMLgAQiqf36T0Cf4w7Ec3l0Vb+Hdq2Z6Dx9vdb0hH2AVxVRB0Ioo6+J+hVhpnLSVokTCUiDM3rX34urB2UKBNYiYrO/ZZZPD3NSQOhLk8J101SnvGxAwWoOjDm9Q5hPR8pP1+ZtUvvzgPQTRekY2ISzxpP3t//eAvQdlig7aWLEzG5FDVzwyaHo9fLb3SwH1/WQ9svmx7sJYI9k2NRBS8YSSffTeLkNEri1Zl6AFGy4KKYvF5wyY7YmlIdczGSpthhRR2seR4+/9/GKWtdR5a231+OspzeZCUU4zC/dl42YMQRUJ0YJ+p8de8NpJjKUlJXcPqQZIuwywseuX6um4EdPRcmOO3l5FgiLEIqhuO2bPBUgb5V6p3QxAOlvCFtwMwfC9j5a88yeY2EREYxmz9mvnNgE+9lHRPhf/aBDBhn3z7uCQdDaYG35e2UYFwbhcDjIL5a+9WzrzPFa+FXl0DN/ZlOsNJu9YWw4N3ljrJ9DXGYQ5CUVKwmU2vKlrwy3ncNJdz5h3sJOmSFK7w2c5bftteRiyltPcXMXznbxkUp8w58RWSLjUBF35W7YaMI6TT0V2YxeJ3OGNEP4TwaRBmNWQvRk/bS3aZiQQz3eyO8TrXCwu9Lsz57XUr9UyPnqa2dc0AjrtwUlBxprURS1YTlzqmSODxrPBGMw5uFTewqJ00NRmYVckXAxIYPw+GVAKARvxPrvHMSbzXDQ7UHgzotiRpHeAs7iChjdnjNODYu0wCBhT3P0njPwNL+5/OuWxPfs4 jkC+jHtl essrBuKIoMm+gaAmC3VFER/rXvuX4sgOYkZb6SZQrs2VShI5vDCWFittUYkYOmhF/KPA+GHwXUpBs1LYA6YMBz9bQNWF8+0LQ7l34Tb8CV8b3D/dQzcaLCXx0uDsbrHn2tXQPuG7xBIS3lZ4F75gfMlTm9Lkzj8hDUeW+uwU+9StBpjlwlcZA9QrSEqe7XW4t9dy6I38jrOowdZXB4VBMn4p18pg3XRgK6X/z/12ZEuCunfyeMlfbuNzbaZoR5OkqmdedlvGO4CktfNHe5Rq0RXzRrxR2G91Gm8tImeowOk0pllQKYaXuxzp7JhuyVXFL3i2LHyeDF/rOgLc= 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: Move the ctl_table with the "tainted" proc_name into kernel/panic.c. With it moves the proc_tainted helper function. 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/panic.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ kernel/sysctl.c | 49 ------------------------------------------------- 2 files changed, 50 insertions(+), 49 deletions(-) diff --git a/kernel/panic.c b/kernel/panic.c index 047ea3215312c439950c6ec4674a91572146234d..213c6c9d6a750ff3d17f3cf530b37c619cd816f4 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -84,6 +84,50 @@ ATOMIC_NOTIFIER_HEAD(panic_notifier_list); EXPORT_SYMBOL(panic_notifier_list); #ifdef CONFIG_SYSCTL + +/* + * Taint values can only be increased + * This means we can safely use a temporary. + */ +static int proc_taint(const struct ctl_table *table, int write, + void *buffer, size_t *lenp, loff_t *ppos) +{ + struct ctl_table t; + unsigned long tmptaint = get_taint(); + int err; + + if (write && !capable(CAP_SYS_ADMIN)) + return -EPERM; + + t = *table; + t.data = &tmptaint; + err = proc_doulongvec_minmax(&t, write, buffer, lenp, ppos); + if (err < 0) + return err; + + if (write) { + int i; + + /* + * If we are relying on panic_on_taint not producing + * false positives due to userspace input, bail out + * before setting the requested taint flags. + */ + if (panic_on_taint_nousertaint && (tmptaint & panic_on_taint)) + return -EINVAL; + + /* + * Poor man's atomic or. Not worth adding a primitive + * to everyone's atomic.h for this + */ + for (i = 0; i < TAINT_FLAGS_COUNT; i++) + if ((1UL << i) & tmptaint) + add_taint(i, LOCKDEP_STILL_OK); + } + + return err; +} + static const struct ctl_table kern_panic_table[] = { #ifdef CONFIG_SMP { @@ -96,6 +140,12 @@ static const struct ctl_table kern_panic_table[] = { .extra2 = SYSCTL_ONE, }, #endif + { + .procname = "tainted", + .maxlen = sizeof(long), + .mode = 0644, + .proc_handler = proc_taint, + }, { .procname = "panic", .data = &panic_timeout, diff --git a/kernel/sysctl.c b/kernel/sysctl.c index ebcc7d75acd9fecbf3c10f31480c3cb6960cb53e..9d8db9cef11122993d850ab5c753e3da1cbfb5cc 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -731,49 +731,6 @@ int proc_douintvec(const struct ctl_table *table, int write, void *buffer, do_proc_douintvec_conv, NULL); } -/* - * Taint values can only be increased - * This means we can safely use a temporary. - */ -static int proc_taint(const struct ctl_table *table, int write, - void *buffer, size_t *lenp, loff_t *ppos) -{ - struct ctl_table t; - unsigned long tmptaint = get_taint(); - int err; - - if (write && !capable(CAP_SYS_ADMIN)) - return -EPERM; - - t = *table; - t.data = &tmptaint; - err = proc_doulongvec_minmax(&t, write, buffer, lenp, ppos); - if (err < 0) - return err; - - if (write) { - int i; - - /* - * If we are relying on panic_on_taint not producing - * false positives due to userspace input, bail out - * before setting the requested taint flags. - */ - if (panic_on_taint_nousertaint && (tmptaint & panic_on_taint)) - return -EINVAL; - - /* - * Poor man's atomic or. Not worth adding a primitive - * to everyone's atomic.h for this - */ - for (i = 0; i < TAINT_FLAGS_COUNT; i++) - if ((1UL << i) & tmptaint) - add_taint(i, LOCKDEP_STILL_OK); - } - - return err; -} - /** * struct do_proc_dointvec_minmax_conv_param - proc_dointvec_minmax() range checking structure * @min: pointer to minimum allowable value @@ -1557,12 +1514,6 @@ int proc_do_static_key(const struct ctl_table *table, int write, static const struct ctl_table kern_table[] = { #ifdef CONFIG_PROC_SYSCTL - { - .procname = "tainted", - .maxlen = sizeof(long), - .mode = 0644, - .proc_handler = proc_taint, - }, { .procname = "sysctl_writes_strict", .data = &sysctl_writes_strict, -- 2.47.2