[folded-merged] proc-shotgun-test-read-readdir-readlink-a-little-write-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: proc: fixup test for read
has been removed from the -mm tree.  Its filename was
     proc-shotgun-test-read-readdir-readlink-a-little-write-fix.patch

This patch was dropped because it was folded into proc-shotgun-test-read-readdir-readlink-a-little-write.patch

------------------------------------------------------
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Subject: proc: fixup test for read

/proc/kmsg can and will block if read under root.

Link: http://lkml.kernel.org/r/20180316232147.GA20146@avx2
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---


diff -puN tools/testing/selftests/proc/read.c~proc-shotgun-test-read-readdir-readlink-a-little-write-fix tools/testing/selftests/proc/read.c
--- a/tools/testing/selftests/proc/read.c~proc-shotgun-test-read-readdir-readlink-a-little-write-fix
+++ a/tools/testing/selftests/proc/read.c
@@ -54,7 +54,8 @@ static void f_reg(DIR *d, const char *fi
 	int fd;
 	ssize_t rv;
 
-	fd = openat(dirfd(d), filename, O_RDONLY);
+	/* read from /proc/kmsg can block */
+	fd = openat(dirfd(d), filename, O_RDONLY|O_NONBLOCK);
 	if (fd == -1)
 		return;
 	rv = read(fd, buf, sizeof(buf));
_

Patches currently in -mm which might be from adobriyan@xxxxxxxxx are

proc-do-less-stuff-under-pde_unload_lock.patch
proc-move-proc-sysvipc-creation-to-where-it-belongs.patch
proc-faster-open-close-of-files-without-release-hook.patch
proc-randomize-struct-pde_opener.patch
proc-move-struct-pde_opener-to-kmem-cache.patch
proc-account-struct-pde_opener.patch
proc-check-permissions-earlier-for-proc-wchan.patch
proc-use-set_puts-at-proc-wchan.patch
proc-test-proc-self-wchan.patch
proc-test-proc-self-syscall.patch
proc-move-struct-proc_dir_entry-into-kmem-cache.patch
proc-fix-proc-map_files-lookup-some-more.patch
proc-register-filesystem-last.patch
proc-faster-proc-cmdline.patch
proc-do-mmput-asap-for-proc-map_files.patch
proc-test-last-field-of-proc-loadavg.patch
proc-reject-and-as-filenames.patch
proc-switch-struct-proc_dir_entry-count-to-refcount.patch
proc-shotgun-test-read-readdir-readlink-a-little-write.patch
proc-shotgun-test-read-readdir-readlink-a-little-write-fix-2.patch
proc-use-slower-rb_first.patch
proc-test-proc-uptime.patch
uts-create-struct-uts_namespace-from-kmem_cache.patch
seq_file-allocate-seq_file-from-kmem_cache.patch
seq_file-account-everything.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



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux