[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240315-sysctl-net-ownership-v1-1-2b465555a292@weissschuh.net>
Date: Fri, 15 Mar 2024 17:20:31 +0100
From: Thomas Weißschuh <linux@...ssschuh.net>
To: "David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
"Eric W. Biederman" <ebiederm@...ssion.com>
Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
Luis Chamberlain <mcgrof@...nel.org>,
Joel Granados <j.granados@...sung.com>,
Thomas Weißschuh <linux@...ssschuh.net>
Subject: [PATCH] net: always initialize sysctl ownership
The sysctl core does not initialize these fields when the set_ownership
callback is present.
So always do it in the callback.
Fixes: e79c6a4fc923 ("net: make net namespace sysctls belong to container's owner")
Signed-off-by: Thomas Weißschuh <linux@...ssschuh.net>
---
net/sysctl_net.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index 051ed5f6fc93..03e320ddacc9 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -62,12 +62,10 @@ static void net_ctl_set_ownership(struct ctl_table_header *head,
kgid_t ns_root_gid;
ns_root_uid = make_kuid(net->user_ns, 0);
- if (uid_valid(ns_root_uid))
- *uid = ns_root_uid;
+ *uid = uid_valid(ns_root_uid) ? ns_root_uid : GLOBAL_ROOT_UID;
ns_root_gid = make_kgid(net->user_ns, 0);
- if (gid_valid(ns_root_gid))
- *gid = ns_root_gid;
+ *gid = gid_valid(ns_root_gid) ? ns_root_gid : GLOBAL_ROOT_GID;
}
static struct ctl_table_root net_sysctl_root = {
---
base-commit: e5eb28f6d1afebed4bb7d740a797d0390bd3a357
change-id: 20240315-sysctl-net-ownership-bc4e17eaeea6
Best regards,
--
Thomas Weißschuh <linux@...ssschuh.net>
Powered by blists - more mailing lists