diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 11:58:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-17 11:58:04 -0400 |
commit | 57a8ec387e1441ea5e1232bc0749fb99a8cba7e7 (patch) | |
tree | b5fb03fc6bc5754de8b5b1f8b0e4f36d67c8315c /tools/testing/selftests/proc/setns-sysvipc.c | |
parent | 0a8ad0ffa4d80a544f6cbff703bf6394339afcdf (diff) | |
parent | 43e11fa2d1d3b6e35629fa556eb7d571edba2010 (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton:
"VM:
- z3fold fixes and enhancements by Henry Burns and Vitaly Wool
- more accurate reclaimed slab caches calculations by Yafang Shao
- fix MAP_UNINITIALIZED UAPI symbol to not depend on config, by
Christoph Hellwig
- !CONFIG_MMU fixes by Christoph Hellwig
- new novmcoredd parameter to omit device dumps from vmcore, by
Kairui Song
- new test_meminit module for testing heap and pagealloc
initialization, by Alexander Potapenko
- ioremap improvements for huge mappings, by Anshuman Khandual
- generalize kprobe page fault handling, by Anshuman Khandual
- device-dax hotplug fixes and improvements, by Pavel Tatashin
- enable synchronous DAX fault on powerpc, by Aneesh Kumar K.V
- add pte_devmap() support for arm64, by Robin Murphy
- unify locked_vm accounting with a helper, by Daniel Jordan
- several misc fixes
core/lib:
- new typeof_member() macro including some users, by Alexey Dobriyan
- make BIT() and GENMASK() available in asm, by Masahiro Yamada
- changed LIST_POISON2 on x86_64 to 0xdead000000000122 for better
code generation, by Alexey Dobriyan
- rbtree code size optimizations, by Michel Lespinasse
- convert struct pid count to refcount_t, by Joel Fernandes
get_maintainer.pl:
- add --no-moderated switch to skip moderated ML's, by Joe Perches
misc:
- ptrace PTRACE_GET_SYSCALL_INFO interface
- coda updates
- gdb scripts, various"
[ Using merge message suggestion from Vlastimil Babka, with some editing - Linus ]
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (100 commits)
fs/select.c: use struct_size() in kmalloc()
mm: add account_locked_vm utility function
arm64: mm: implement pte_devmap support
mm: introduce ARCH_HAS_PTE_DEVMAP
mm: clean up is_device_*_page() definitions
mm/mmap: move common defines to mman-common.h
mm: move MAP_SYNC to asm-generic/mman-common.h
device-dax: "Hotremove" persistent memory that is used like normal RAM
mm/hotplug: make remove_memory() interface usable
device-dax: fix memory and resource leak if hotplug fails
include/linux/lz4.h: fix spelling and copy-paste errors in documentation
ipc/mqueue.c: only perform resource calculation if user valid
include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures
scripts/gdb: add helpers to find and list devices
scripts/gdb: add lx-genpd-summary command
drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl
kernel/pid.c: convert struct pid count to refcount_t
drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings
select: shift restore_saved_sigmask_unless() into poll_select_copy_remaining()
select: change do_poll() to return -ERESTARTNOHAND rather than -EINTR
...
Diffstat (limited to 'tools/testing/selftests/proc/setns-sysvipc.c')
-rw-r--r-- | tools/testing/selftests/proc/setns-sysvipc.c | 133 |
1 files changed, 133 insertions, 0 deletions
diff --git a/tools/testing/selftests/proc/setns-sysvipc.c b/tools/testing/selftests/proc/setns-sysvipc.c new file mode 100644 index 000000000000..903890c5e587 --- /dev/null +++ b/tools/testing/selftests/proc/setns-sysvipc.c | |||
@@ -0,0 +1,133 @@ | |||
1 | /* | ||
2 | * Copyright © 2019 Alexey Dobriyan <adobriyan@gmail.com> | ||
3 | * | ||
4 | * Permission to use, copy, modify, and distribute this software for any | ||
5 | * purpose with or without fee is hereby granted, provided that the above | ||
6 | * copyright notice and this permission notice appear in all copies. | ||
7 | * | ||
8 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
9 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
10 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
11 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
12 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
13 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
15 | */ | ||
16 | /* | ||
17 | * Test that setns(CLONE_NEWIPC) points to new /proc/sysvipc content even | ||
18 | * if old one is in dcache. | ||
19 | */ | ||
20 | #undef NDEBUG | ||
21 | #include <assert.h> | ||
22 | #include <errno.h> | ||
23 | #include <stdio.h> | ||
24 | #include <sched.h> | ||
25 | #include <signal.h> | ||
26 | #include <stdlib.h> | ||
27 | #include <string.h> | ||
28 | #include <unistd.h> | ||
29 | #include <sys/types.h> | ||
30 | #include <sys/stat.h> | ||
31 | #include <fcntl.h> | ||
32 | #include <sys/ipc.h> | ||
33 | #include <sys/shm.h> | ||
34 | |||
35 | static pid_t pid = -1; | ||
36 | |||
37 | static void f(void) | ||
38 | { | ||
39 | if (pid > 0) { | ||
40 | kill(pid, SIGTERM); | ||
41 | } | ||
42 | } | ||
43 | |||
44 | int main(void) | ||
45 | { | ||
46 | int fd[2]; | ||
47 | char _ = 0; | ||
48 | int nsfd; | ||
49 | |||
50 | atexit(f); | ||
51 | |||
52 | /* Check for priviledges and syscall availability straight away. */ | ||
53 | if (unshare(CLONE_NEWIPC) == -1) { | ||
54 | if (errno == ENOSYS || errno == EPERM) { | ||
55 | return 4; | ||
56 | } | ||
57 | return 1; | ||
58 | } | ||
59 | /* Distinguisher between two otherwise empty IPC namespaces. */ | ||
60 | if (shmget(IPC_PRIVATE, 1, IPC_CREAT) == -1) { | ||
61 | return 1; | ||
62 | } | ||
63 | |||
64 | if (pipe(fd) == -1) { | ||
65 | return 1; | ||
66 | } | ||
67 | |||
68 | pid = fork(); | ||
69 | if (pid == -1) { | ||
70 | return 1; | ||
71 | } | ||
72 | |||
73 | if (pid == 0) { | ||
74 | if (unshare(CLONE_NEWIPC) == -1) { | ||
75 | return 1; | ||
76 | } | ||
77 | |||
78 | if (write(fd[1], &_, 1) != 1) { | ||
79 | return 1; | ||
80 | } | ||
81 | |||
82 | pause(); | ||
83 | |||
84 | return 0; | ||
85 | } | ||
86 | |||
87 | if (read(fd[0], &_, 1) != 1) { | ||
88 | return 1; | ||
89 | } | ||
90 | |||
91 | { | ||
92 | char buf[64]; | ||
93 | snprintf(buf, sizeof(buf), "/proc/%u/ns/ipc", pid); | ||
94 | nsfd = open(buf, O_RDONLY); | ||
95 | if (nsfd == -1) { | ||
96 | return 1; | ||
97 | } | ||
98 | } | ||
99 | |||
100 | /* Reliably pin dentry into dcache. */ | ||
101 | (void)open("/proc/sysvipc/shm", O_RDONLY); | ||
102 | |||
103 | if (setns(nsfd, CLONE_NEWIPC) == -1) { | ||
104 | return 1; | ||
105 | } | ||
106 | |||
107 | kill(pid, SIGTERM); | ||
108 | pid = 0; | ||
109 | |||
110 | { | ||
111 | char buf[4096]; | ||
112 | ssize_t rv; | ||
113 | int fd; | ||
114 | |||
115 | fd = open("/proc/sysvipc/shm", O_RDONLY); | ||
116 | if (fd == -1) { | ||
117 | return 1; | ||
118 | } | ||
119 | |||
120 | #define S32 " key shmid perms size cpid lpid nattch uid gid cuid cgid atime dtime ctime rss swap\n" | ||
121 | #define S64 " key shmid perms size cpid lpid nattch uid gid cuid cgid atime dtime ctime rss swap\n" | ||
122 | rv = read(fd, buf, sizeof(buf)); | ||
123 | if (rv == strlen(S32)) { | ||
124 | assert(memcmp(buf, S32, strlen(S32)) == 0); | ||
125 | } else if (rv == strlen(S64)) { | ||
126 | assert(memcmp(buf, S64, strlen(S64)) == 0); | ||
127 | } else { | ||
128 | assert(0); | ||
129 | } | ||
130 | } | ||
131 | |||
132 | return 0; | ||
133 | } | ||