2022-01-07 10:39:03

by Geert Uytterhoeven

Subject: [PATCH] sysctl: Fix duplicate path separator in printed entries

sysctl_print_dir() always terminates the printed path name with a slash,
so printing a slash before the file part causes a duplicate like in

sysctl duplicate entry: /kernel//perf_user_access

Fix this by dropping the extra slash.

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
fs/proc/proc_sysctl.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 5d66faecd4ef06b8..4f6168ec5079fc8f 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -163,7 +163,7 @@ static int insert_entry(struct ctl_table_header *head, struct ctl_table *entry)
else {
pr_err("sysctl duplicate entry: ");
sysctl_print_dir(head->parent);
- pr_cont("/%s\n", entry->procname);
+ pr_cont("%s\n", entry->procname);
return -EEXIST;
}
}
@@ -1020,8 +1020,8 @@ static struct ctl_dir *get_subdir(struct ctl_dir *dir,
if (IS_ERR(subdir)) {
pr_err("sysctl could not get directory: ");
sysctl_print_dir(dir);
- pr_cont("/%*.*s %ld\n",
- namelen, namelen, name, PTR_ERR(subdir));
+ pr_cont("%*.*s %ld\n", namelen, namelen, name,
+ PTR_ERR(subdir));
}
drop_sysctl_table(&dir->header);
if (new)
@@ -1626,7 +1626,7 @@ static void put_links(struct ctl_table_header *header)
else {
pr_err("sysctl link missing during unregister: ");
sysctl_print_dir(parent);
- pr_cont("/%s\n", name);
+ pr_cont("%s\n", name);
}
}
}
--
2.25.1

2022-01-07 11:29:49

by Christian Brauner

Subject: Re: [PATCH] sysctl: Fix duplicate path separator in printed entries

On Fri, Jan 07, 2022 at 11:38:44AM +0100, Geert Uytterhoeven wrote:
> sysctl_print_dir() always terminates the printed path name with a slash,
> so printing a slash before the file part causes a duplicate like in
>
> sysctl duplicate entry: /kernel//perf_user_access
>
> Fix this by dropping the extra slash.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---

Seems good,
Acked-by: Christian Brauner <[email protected]>

2022-01-11 18:05:44

by Luis Chamberlain

Subject: Re: [PATCH] sysctl: Fix duplicate path separator in printed entries

On Fri, Jan 07, 2022 at 11:38:44AM +0100, Geert Uytterhoeven wrote:
> sysctl_print_dir() always terminates the printed path name with a slash,
> so printing a slash before the file part causes a duplicate like in
>
> sysctl duplicate entry: /kernel//perf_user_access
>
> Fix this by dropping the extra slash.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>

Acked-by: Luis Chamberlain <[email protected]>

Luis