diff options
| author | graysky | 2018-08-21 15:55:31 -0400 |
|---|---|---|
| committer | graysky | 2018-08-21 15:55:31 -0400 |
| commit | 1df1f4df8d8e96e0125e94e902f1b0d9818d7f7a (patch) | |
| tree | a1f1f4c049f7b35ec75ef41962d5476baf05c855 /0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | |
| parent | a484585bf7a8a040cf405d5a860e025fd788ce39 (diff) | |
| download | aur-1df1f4df8d8e96e0125e94e902f1b0d9818d7f7a.tar.gz | |
Update to 4.18.4rc1-1
Diffstat (limited to '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch')
| -rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch index 0249a08eb723..7ab991e4b844 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,7 +1,7 @@ -From 66a37293bf1ec5bf9d22ede72818099f2c72fbc1 Mon Sep 17 00:00:00 2001 +From 30a5ee062a5b7ce1c54125330d3f752b59d6f099 Mon Sep 17 00:00:00 2001 From: Serge Hallyn <serge.hallyn@canonical.com> Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/5] add sysctl to disallow unprivileged CLONE_NEWUSER by +Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> @@ -14,7 +14,7 @@ Signed-off-by: Daniel Micay <danielmicay@gmail.com> 3 files changed, 30 insertions(+) diff --git a/kernel/fork.c b/kernel/fork.c -index 5ad558e6f8fe..767485c6f7cc 100644 +index 1b27babc4c78..a88dd3ccd31c 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -103,6 +103,11 @@ @@ -29,7 +29,7 @@ index 5ad558e6f8fe..767485c6f7cc 100644 /* * Minimum number of threads to boot the kernel -@@ -1600,6 +1605,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1624,6 +1629,10 @@ static __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -40,7 +40,7 @@ index 5ad558e6f8fe..767485c6f7cc 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2394,6 +2403,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -2420,6 +2429,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -54,7 +54,7 @@ index 5ad558e6f8fe..767485c6f7cc 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 6a78cf70761d..35a1d24282f4 100644 +index 2d9837c0aff4..eb5236c069fc 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -105,6 +105,9 @@ extern int core_uses_pid; @@ -84,7 +84,7 @@ index 6a78cf70761d..35a1d24282f4 100644 { .procname = "tainted", diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index 246d4d4ce5c7..f64432b45cec 100644 +index c3d7583fcd21..6ee37e516869 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -26,6 +26,9 @@ |