The patch titled
Subject: fs/proc/proc_sysctl.c: remove redundant link check in proc_sys_link_fill_cache()
has been removed from the -mm tree. Its filename was
fs-sysctl-remove-redundant-link-check-in-proc_sys_link_fill_cache.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Danilo Krummrich <danilokrummrich@xxxxxxxxxxxxx>
Subject: 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@xxxxxxxxxxxxx
Signed-off-by: Danilo Krummrich <danilokrummrich@xxxxxxxxxxxxx>
Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: "Luis R . Rodriguez" <mcgrof@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/proc_sysctl.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff -puN fs/proc/proc_sysctl.c~fs-sysctl-remove-redundant-link-check-in-proc_sys_link_fill_cache fs/proc/proc_sysctl.c
--- a/fs/proc/proc_sysctl.c~fs-sysctl-remove-redundant-link-check-in-proc_sys_link_fill_cache
+++ a/fs/proc/proc_sysctl.c
@@ -712,12 +712,9 @@ static bool proc_sys_link_fill_cache(str
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:
_
Patches currently in -mm which might be from danilokrummrich@xxxxxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
