The patch titled Subject: procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix has been removed from the -mm tree. Its filename was procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix.patch This patch was dropped because it was folded into procfs-always-expose-proc-pid-map_files-and-make-it-readable.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix catch up with concurrent proc_pid_follow_link() changes Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx> Cc: Calvin Owens <calvinowens@xxxxxx> Cc: Cyrill Gorcunov <gorcunov@xxxxxxxxxx> Cc: Joe Perches <joe@xxxxxxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/proc/base.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN fs/proc/base.c~procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix fs/proc/base.c --- a/fs/proc/base.c~procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix +++ a/fs/proc/base.c @@ -1955,12 +1955,13 @@ struct map_files_info { * symlinks may be used to bypass permissions on ancestor directories in the * path to the file in question. */ -static void *proc_map_files_follow_link(struct dentry *dentry, struct nameidata *nd) +static void * +proc_map_files_follow_link(struct dentry *dentry, struct nameidata *nd) { if (!capable(CAP_SYS_ADMIN)) return ERR_PTR(-EPERM); - return proc_pid_follow_link(dentry, nd); + return proc_pid_follow_link(dentry, NULL); } /* _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are procfs-always-expose-proc-pid-map_files-and-make-it-readable.patch procfs-always-expose-proc-pid-map_files-and-make-it-readable-fix-fix.patch fs-coda-fix-readlink-buffer-overflow-checkpatch-fixes.patch kexec-split-kexec_file-syscall-code-to-kexec_filec-fix.patch kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2.patch kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix.patch kexec-split-kexec_file-syscall-code-to-kexec_filec-fix-2-fix-fix.patch kexec-split-kexec_load-syscall-from-kexec-core-code-checkpatch-fixes.patch align-crash_notes-allocation-to-make-it-be-inside-one-physical-page-fix.patch mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix-checkpatch-fixes.patch -- 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