blob: 3283dd7ad8acfe1bfd2de87fc199df8438b1ab1e [file] [log] [blame]
Andrew Geisslerd159c7f2021-09-02 21:05:58 -05001From a8bc44936202692edcd82a48c07d7cf27d6ed8ee Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sun, 29 Aug 2021 20:49:16 +0800
4Subject: [PATCH] fix create thread failed in unprivileged process [BZ #28287]
5
6Since commit [d8ea0d0168 Add an internal wrapper for clone, clone2 and clone3]
7applied, start a unprivileged container (docker run without --privileged),
8it creates a thread failed in container.
9
10In commit d8ea0d0168, it calls __clone3 if HAVE_CLONE3_WAPPER is defined. If
11__clone3 returns -1 with ENOSYS, fall back to clone or clone2.
12
13As known from [1], cloneXXX fails with EPERM if CLONE_NEWCGROUP,
14CLONE_NEWIPC, CLONE_NEWNET, CLONE_NEWNS, CLONE_NEWPID, or CLONE_NEWUTS
15was specified by an unprivileged process (process without CAP_SYS_ADMIN)
16
17[1] https://man7.org/linux/man-pages/man2/clone3.2.html
18
19So if __clone3 returns -1 with EPERM, fall back to clone or clone2 could
20fix the issue. Here are the test steps:
21
221) Prepare test code
23cat > conftest.c <<ENDOF
24 #include <pthread.h>
25 #include <stdio.h>
26
27int check_me = 0;
28void* func(void* data) {check_me = 42; printf("start thread: check_me %d\n", check_me); return &check_me;}
29int main()
30{
31 pthread_t t;
32 void *ret;
33 pthread_create (&t, 0, func, 0);
34 pthread_join (t, &ret);
35 printf("check_me %d, p %p\n", check_me, &ret);
36 return (check_me != 42 || ret != &check_me);
37}
38
39ENDOF
40
412) Compile
42gcc -o conftest -pthread conftest.c
43
443) Start a container with glibc 2.34 installed
45[skip details]
46docker run -it <container-image-name> bash
47
484) Run conftest without this patch
49$ ./conftest
50check_me 0, p 0x7ffd91ccd400
51
525) Run conftest with this patch
53$ ./conftest
54start thread: check_me 42
55check_me 42, p 0x7ffe253c6f20
56
57Upstream-Status: Submitted [libc-alpha@sourceware.org]
58
59Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
60---
61 sysdeps/unix/sysv/linux/clone-internal.c | 2 +-
62 1 file changed, 1 insertion(+), 1 deletion(-)
63
64diff --git a/sysdeps/unix/sysv/linux/clone-internal.c b/sysdeps/unix/sysv/linux/clone-internal.c
65index 979f7880be..97101994e8 100644
66--- a/sysdeps/unix/sysv/linux/clone-internal.c
67+++ b/sysdeps/unix/sysv/linux/clone-internal.c
68@@ -52,7 +52,7 @@ __clone_internal (struct clone_args *cl_args,
69 /* Try clone3 first. */
70 int saved_errno = errno;
71 ret = __clone3 (cl_args, sizeof (*cl_args), func, arg);
72- if (ret != -1 || errno != ENOSYS)
73+ if (ret != -1 || (errno != ENOSYS && errno != EPERM))
74 return ret;
75
76 /* NB: Restore errno since errno may be checked against non-zero
77--
782.30.2
79