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/[email protected]
Signed-off-by: Danilo Krummrich <[email protected]>
Acked-by: Kees Cook <[email protected]>
Reviewed-by: Andrew Morton <[email protected]>
Cc: Alexey Dobriyan <[email protected]>
Cc: "Eric W. Biederman" <[email protected]>
Cc: "Luis R . Rodriguez" <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 7da10e59529765200b8db1915c21807a90bde66e..4654fc3c246fab0d4a79672e68438c970c4a49ec 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -712,12 +712,9 @@ static bool proc_sys_link_fill_cache(struct file *file,
        if (IS_ERR(head))
                return false;
 
-       if (S_ISLNK(table->mode)) {
-               /* It is not an error if we can not follow the link ignore it */
-               int err = sysctl_follow_link(&head, &table);
-               if (err)
-                       goto out;
-       }
+       /* It is not an error if we can not follow the link ignore it */
+       if (sysctl_follow_link(&head, &table))
+               goto out;
 
        ret = proc_sys_fill_cache(file, ctx, head, table);
 out: