From patchwork Tue Dec 26 12:32:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 183313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp834004dyb; Tue, 26 Dec 2023 04:33:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IHt4PWCj3mcA14aqBYHAtLkM3iVPRgFtVEcGQ8EknGuaNQYFD70nJUYvZXzekEWbaxqCasH X-Received: by 2002:ad4:5cc4:0:b0:67f:70f1:e57 with SMTP id iu4-20020ad45cc4000000b0067f70f10e57mr13159978qvb.24.1703594003314; Tue, 26 Dec 2023 04:33:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703594003; cv=none; d=google.com; s=arc-20160816; b=rpVGTHJtcvmbo5PP3vdqn9JyvndE++1lt8nGkf4YTbAeMlxmUG6B42pWgdiCfLsQp1 S7ThVf58sGyxAaEP4K1TVk9DgEnBOZ75N1nv9heAegHiInCygJ1BfNMAJF4FQ9qRsX7s OZm+euDMQXssb5/POoxlHEt6rfviMXc8nFtw8+ZS/97ha4bvZ5SrepaqvIVIYN56yMmb vjERvFAcVVrtmp6bVfR8wBwOAKgWpTrelpRy70Ow+9Kk02RcUsF8J9eNGv7P/JhD+xwa KsEimtX5++5icegkHbuGpFeEA6q4TJQX9U4EJFF+ZDGB1hFxxvG5foovsyMMPVfPs/07 adng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:message-id:content-transfer-encoding:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:subject:date :from:dkim-signature; bh=TKFAMO/LJcSP2JBsITwOczeIb+ssEw09Zh6Rxx4hU30=; fh=KP8fywTQ0VKcXmy4iXzxHUg5VrasAdhHkT+1534qeI8=; b=ZAeDdRIwdoCWjRYLanymtwkycLJ8X1yPykXnD2uKfPqWB2EvorBvAKcT127oXFfHgM yyGylv9i68FrZhz+qQZDiGDD57Y78Au6ZINS69JTL6SSqhTgb+rl35woNt1W7CyJzHB1 6pBw1L1FJG9iKbnwDcHsrBGtznvpLv6JW0wfFoeNlGPrgOay04gJooiSTD0IiqJKYQYw x1Wm31IU1n6YSULcGhgsGANJs+hl3qhLgQiTXS1fB+Xecbk0qQiDRE34UdKlCrsCfoh5 68+ZrAhNQ3qj7egOiw20qzxOMBySyiRngVMJQcA7mexZlUTpcIJtKC8PCGrERV3oHQdO 7XmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b="Ko4Kj/nE"; spf=pass (google.com: domain of linux-kernel+bounces-11507-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11507-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id t10-20020a0cb70a000000b0067f8c4235f0si10094108qvd.415.2023.12.26.04.33.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Dec 2023 04:33:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-11507-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b="Ko4Kj/nE"; spf=pass (google.com: domain of linux-kernel+bounces-11507-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11507-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 1E7591C21E82 for ; Tue, 26 Dec 2023 12:33:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 330AD4F201; Tue, 26 Dec 2023 12:32:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="Ko4Kj/nE" X-Original-To: linux-kernel@vger.kernel.org Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 850FC20307; Tue, 26 Dec 2023 12:32:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1703593963; bh=L9GAaUe+lSBriHrdLSPoY+6yNGsO1d1cvnSIhXdaP6Q=; h=From:Date:Subject:To:Cc:From; b=Ko4Kj/nE+JBGo7sEr9wqHwsncYVqpKmfZII3vlxhPWHDLyBMk1wdQkqpI5Ur+kwXT BwE8pv3US0u1g0qDd5eDjTBpdVlbCOBWTJAQfQdSVj9hFW8jb2qcYXW2rS5etgZgLZ bm9p1XdgAsMs1EsnAfxjAsZCDQwE8AOvfrG0Ghxw= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Tue, 26 Dec 2023 13:32:42 +0100 Subject: [PATCH] sysctl: treewide: constify ctl_table_root::set_ownership Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231226-sysctl-const-ownership-v1-1-d78fdd744ba1@weissschuh.net> X-B4-Tracking: v=1; b=H4sIAOnHimUC/x3MSwqEMBBF0a1IjS3QqBF6K40DTb9ogSSSkv4Q3 HsHh2dwbyZFEig9qkwJb1GJoaCtK3LbHFawvIrJNKZrjbGsP3Xnzi4GPTl+ApJucrD34wA7Lj0 wU4mPBC/fe/ycrusPFF5sEGgAAAA= To: Luis Chamberlain , Kees Cook , Joel Granados , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1703593962; l=2286; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=L9GAaUe+lSBriHrdLSPoY+6yNGsO1d1cvnSIhXdaP6Q=; b=kOSizBjzR6oCvTWhrMMELhvhfemQm6x93hbVaC0+D+zdFlkTwAznHfKld2xSD4iolj5a7VJJz mgBsZAt3zk8CZqw5459P6az7GxW8aKyd92Wq9UIWT69/Ximetj2sSQg X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786347785346463935 X-GMAIL-MSGID: 1786347785346463935 The set_ownership callback is not supposed to modify the ctl_table. Enforce this expectation via the typesystem. The patch was created with the following coccinelle script: virtual patch virtual context virtual report @@ identifier func, head, table, uid, gid; @@ void func( struct ctl_table_header *head, - struct ctl_table *table, + const struct ctl_table *table, kuid_t *uid, kgid_t *gid) { ... } This change also is a step to put "struct ctl_table" into .rodata throughout the kernel. Signed-off-by: Thomas Weißschuh --- The patch is meant to be merged via the sysctl tree. This change was originally part of the sysctl-const series [0]. To slim down that series and reduce the message load on other maintainers to a minimumble, submit this patch on its own. [0] https://lore.kernel.org/lkml/20231204-const-sysctl-v2-2-7a5060b11447@weissschuh.net/ --- include/linux/sysctl.h | 2 +- net/sysctl_net.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- base-commit: de2ee5e9405e12600c81e39837362800cee433a2 change-id: 20231226-sysctl-const-ownership-ff75e67b4eea Best regards, diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 26a38161c28f..800154e1ff88 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -205,7 +205,7 @@ struct ctl_table_root { struct ctl_table_set default_set; struct ctl_table_set *(*lookup)(struct ctl_table_root *root); void (*set_ownership)(struct ctl_table_header *head, - struct ctl_table *table, + const struct ctl_table *table, kuid_t *uid, kgid_t *gid); int (*permissions)(struct ctl_table_header *head, struct ctl_table *table); }; diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 051ed5f6fc93..1310ef8f0958 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c @@ -54,7 +54,7 @@ static int net_ctl_permissions(struct ctl_table_header *head, } static void net_ctl_set_ownership(struct ctl_table_header *head, - struct ctl_table *table, + const struct ctl_table *table, kuid_t *uid, kgid_t *gid) { struct net *net = container_of(head->set, struct net, sysctls);