p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fs/proc/proc_sysctl.c: remove redundant link check in proc_sys_link_fill_cache() 

proc_sys_link_fill_cache() does not need to check whether we're called
for a link - it's already done by scan().

Link: http://lkml.kernel.org/r/20180228013506.4915-2-danilokrummrich@dk-develop.de
Signed-off-by: Danilo Krummrich <danilokrummrich@dk-develop.de>
Acked-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: "Luis R . Rodriguez" <mcgrof@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Danilo Krummrich 2018-04-10 16:31:41 -07:00 committed by Linus Torvalds
parent a0b0d1c345
commit 835b94e05c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/proc/proc_sysctl.c
View File

@ -712,12 +712,9 @@ static bool proc_sys_link_fill_cache(struct file *file,
if (IS_ERR(head)) if (IS_ERR(head))
return false; return false;
if (S_ISLNK(table->mode)) {
/* It is not an error if we can not follow the link ignore it */ /* It is not an error if we can not follow the link ignore it */
int err = sysctl_follow_link(&head, &table); if (sysctl_follow_link(&head, &table))
if (err)
goto out; goto out;
}
ret = proc_sys_fill_cache(file, ctx, head, table); ret = proc_sys_fill_cache(file, ctx, head, table);
out: out: