From patchwork Tue Dec 26 12:08:48 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: 183310 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp823123dyb; Tue, 26 Dec 2023 04:10:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IGfsIihHdqDC46RbbS64IiimtFO662OdVjM5iiIqSEiq5lNm6/dGXNy0ajSct0R4WL2+iYD X-Received: by 2002:a17:90a:e147:b0:28c:61d3:48e8 with SMTP id ez7-20020a17090ae14700b0028c61d348e8mr407312pjb.44.1703592610374; Tue, 26 Dec 2023 04:10:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703592610; cv=none; d=google.com; s=arc-20160816; b=OPhNhkQTg3KS0a0E42jfxOoW852mohnnOprrizTOygsV4t8aCECnNTbxkXdA+wnxLV AlWstvlcHxmpODu0f0fCSocC0VgbRkV8/JQgrCcrhvmRB6LjKbh8dYPMgrMC6oSDVMrd p0W35K6GtM/UIo1ry6ypK8lWVWnKnrzs6gLzjFOG64CDRVjQP1791u+EMbd77ZhIhxIA isjm/RH7F+GcCJJBA1FBfKrDauVIw+6QkcfBTk5ftM0Y2niDoiIFSmWKLOiUvLGN9bav cY5eiiKQ7LVbSynMEoDilupxVI7IH7wSpFBbtYxUjd8VENCUgKyZ4zLLDLeEzH6PAOA1 lt1Q== 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=q2gzSQT6w8xkzRSzn0v+GeYWnXD+Xk6jW2P4Pvp1v44=; fh=KP8fywTQ0VKcXmy4iXzxHUg5VrasAdhHkT+1534qeI8=; b=pik+ZMFhLLLGGytf1LfnhIK1VbQYgmiGjbmLfRsexPIlkiYH8A44gejTFRti33y8OO ynxlnMZ4bEhCudmzTZT40Y6unQc+ISc3NmylLD50kZUTwYFkYj/VFR2dZrJObdIgTbKz fl4y9iK7IJtrKr6HcEuer9fGaBLLKoL71TlV/7c7Sp1QgGZNqy6FZQdyB0ClN81jSkc9 5G69zxq8N4szZd3XP/x4/B0Y6ztWUXNhs95Z0hxdalMZY9CMTRT4fQ2GoRfvxTOl8O5n +WnF0xadYDOpk3hqOZW8jS+7sAWIJfVR3Ug39nW9TP8+TEjQwz0g8Qr/9IYwnkcQ0CKX SH7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=CFIunnvB; spf=pass (google.com: domain of linux-kernel+bounces-11494-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11494-ouuuleilei=gmail.com@vger.kernel.org" Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id x34-20020a17090a6c2500b0028c05688216si7675466pjj.32.2023.12.26.04.10.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Dec 2023 04:10:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-11494-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@weissschuh.net header.s=mail header.b=CFIunnvB; spf=pass (google.com: domain of linux-kernel+bounces-11494-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11494-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 4620FB21DFB for ; Tue, 26 Dec 2023 12:10:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 072344E63B; Tue, 26 Dec 2023 12:09:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="CFIunnvB" 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 DB6E44E603; Tue, 26 Dec 2023 12:09:34 +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=1703592572; bh=MBNVPTuPe5RQdDMZSU+PMsj2GQT1HD2VDl2L9fGdf+I=; h=From:Date:Subject:To:Cc:From; b=CFIunnvBOMZRp7rDzNobSGjsI69fb6XgLdzeWRdW0p2bo7CYt12l1nN+6Ov/ZaW3c BSY5wS2sMOTgBs4vV6NfjGiBU4usMfB0Q3MKCppJl51ibV/O3dAktjSGad3q+ZetGK pBhYzGNoTGanORzXKfJ3yIDR8rAxNcVRAfBmyAQY= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Tue, 26 Dec 2023 13:08:48 +0100 Subject: [PATCH] sysctl: treewide: constify ctl_table_root::permissions 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-permissions-v1-1-5cd3c91f6299@weissschuh.net> X-B4-Tracking: v=1; b=H4sIAE/CimUC/x3MMQqAMAxA0atIZgM1ggWvIg7SRg1oK42IIt7d6 viH929QTsIKbXFD4kNUYshRlQW4eQgTo/jcQIbqiqhBvdTtC7oYdMeN0yr6GUVv3egNDbapLWS +JR7l/Ndd/zwvn2WHgGoAAAA= 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=1703592571; l=3312; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=MBNVPTuPe5RQdDMZSU+PMsj2GQT1HD2VDl2L9fGdf+I=; b=4ugtZbdhdABoeRlJxXJ6gBFOcTeWMMONsnR+0vV3WvahrjEEIoaPiOO7QRl3tKj4kUJpIv47i lBDbq/STFKeCqzbvSRF6t7ex7YQacpwxu7Vvm1nVkW/6/MpOWfcAm8E X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786346325357045448 X-GMAIL-MSGID: 1786346325357045448 The permissions 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, ctl; @@ int func( struct ctl_table_header *head, - struct ctl_table *ctl) + const struct ctl_table *ctl) { ... } (insert_entry() from fs/proc/proc_sysctl.c is a false-positive) 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 +- ipc/ipc_sysctl.c | 2 +- kernel/ucount.c | 2 +- net/sysctl_net.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) --- base-commit: de2ee5e9405e12600c81e39837362800cee433a2 change-id: 20231226-sysctl-const-permissions-d7cfd02a7637 Best regards, diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 26a38161c28f..8ec2d742c3b4 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -207,7 +207,7 @@ struct ctl_table_root { void (*set_ownership)(struct ctl_table_header *head, struct ctl_table *table, kuid_t *uid, kgid_t *gid); - int (*permissions)(struct ctl_table_header *head, struct ctl_table *table); + int (*permissions)(struct ctl_table_header *head, const struct ctl_table *table); }; /* struct ctl_path describes where in the hierarchy a table is added */ diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c index 8c62e443f78b..b087787f608f 100644 --- a/ipc/ipc_sysctl.c +++ b/ipc/ipc_sysctl.c @@ -190,7 +190,7 @@ static int set_is_seen(struct ctl_table_set *set) return ¤t->nsproxy->ipc_ns->ipc_set == set; } -static int ipc_permissions(struct ctl_table_header *head, struct ctl_table *table) +static int ipc_permissions(struct ctl_table_header *head, const struct ctl_table *table) { int mode = table->mode; diff --git a/kernel/ucount.c b/kernel/ucount.c index 4aa6166cb856..90300840256b 100644 --- a/kernel/ucount.c +++ b/kernel/ucount.c @@ -38,7 +38,7 @@ static int set_is_seen(struct ctl_table_set *set) } static int set_permissions(struct ctl_table_header *head, - struct ctl_table *table) + const struct ctl_table *table) { struct user_namespace *user_ns = container_of(head->set, struct user_namespace, set); diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 051ed5f6fc93..ba9a49de9600 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c @@ -40,7 +40,7 @@ static int is_seen(struct ctl_table_set *set) /* Return standard mode bits for table entry. */ static int net_ctl_permissions(struct ctl_table_header *head, - struct ctl_table *table) + const struct ctl_table *table) { struct net *net = container_of(head->set, struct net, sysctls);