aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Chamberlain <mcgrof@kernel.org>2021-11-17 15:42:41 -0800
committerLuis Chamberlain <mcgrof@kernel.org>2021-11-23 09:05:25 -0800
commit06d33569add5d71725a727d8da80ce480b06fdec (patch)
tree83c49c84e574b99ecd62ced15ff8c93ae6df3367
parent8c930a67012041a7026c90bf9707bd7c41831cc7 (diff)
downloadlinux-next-06d33569add5d71725a727d8da80ce480b06fdec.tar.gz
sysctl: add helper to register a sysctl mount point
The way to create a subdirectory on top of sysctl_mount_point is a bit obscure, and *why* we do that even so more. Provide a helper which makes it clear why we do this. Suggested-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
-rw-r--r--fs/proc/proc_sysctl.c13
-rw-r--r--include/linux/sysctl.h7
2 files changed, 20 insertions, 0 deletions
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 6d462644bb003..aa743bbb84007 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -35,6 +35,19 @@ struct ctl_table sysctl_mount_point[] = {
{ }
};
+/**
+ * register_sysctl_mount_point() - registers a sysctl mount point
+ * @path: path for the mount point
+ *
+ * Used to create a permanently empty directory to serve as mount point.
+ * There are some subtle but important permission checks this allows in the
+ * case of unprivileged mounts.
+ */
+struct ctl_table_header *register_sysctl_mount_point(const char *path)
+{
+ return register_sysctl(path, sysctl_mount_point);
+}
+
static bool is_empty_dir(struct ctl_table_header *head)
{
return head->ctl_table[0].child == sysctl_mount_point;
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index e4da44567f184..2cf36e53ec284 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -208,6 +208,8 @@ extern int sysctl_init(void);
extern void __register_sysctl_init(const char *path, struct ctl_table *table,
const char *table_name);
#define register_sysctl_init(path, table) __register_sysctl_init(path, table, #table)
+extern struct ctl_table_header *register_sysctl_mount_point(const char *path);
+
void do_sysctl_args(void);
extern int pwrsw_enabled;
@@ -223,6 +225,11 @@ static inline struct ctl_table_header *register_sysctl_table(struct ctl_table *
return NULL;
}
+static struct sysctl_header *register_sysctl_mount_point(const char *path)
+{
+ return NULL
+}
+
static inline struct ctl_table_header *register_sysctl_paths(
const struct ctl_path *path, struct ctl_table *table)
{