Commit 835b94e0 authored by Danilo Krummrich's avatar Danilo Krummrich Committed by Linus Torvalds

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.deSigned-off-by: default avatarDanilo Krummrich <danilokrummrich@dk-develop.de>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarAndrew 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a0b0d1c3
...@@ -712,12 +712,9 @@ static bool proc_sys_link_fill_cache(struct file *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 */ if (sysctl_follow_link(&head, &table))
int err = sysctl_follow_link(&head, &table); goto out;
if (err)
goto out;
}
ret = proc_sys_fill_cache(file, ctx, head, table); ret = proc_sys_fill_cache(file, ctx, head, table);
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment