Quoting Mahesh Bandewar (महेश बंडेवार) (mahe...@google.com): > On Wed, Nov 29, 2017 at 9:57 AM, Serge E. Hallyn <se...@hallyn.com> wrote: > > Quoting Mahesh Bandewar (महेश बंडेवार) (mahe...@google.com): > >> On Tue, Nov 28, 2017 at 3:04 PM, Serge E. Hallyn <se...@hallyn.com> wrote: > >> > Quoting Mahesh Bandewar (महेश बंडेवार) (mahe...@google.com): > >> > ... > >> >> >> diff --git a/security/commoncap.c b/security/commoncap.c > >> >> >> index fc46f5b85251..89103f16ac37 100644 > >> >> >> --- a/security/commoncap.c > >> >> >> +++ b/security/commoncap.c > >> >> >> @@ -73,6 +73,14 @@ int cap_capable(const struct cred *cred, struct > >> >> >> user_namespace *targ_ns, > >> >> >> { > >> >> >> struct user_namespace *ns = targ_ns; > >> >> >> > >> >> >> + /* If the capability is controlled and user-ns that process > >> >> >> + * belongs-to is 'controlled' then return EPERM and no need > >> >> >> + * to check the user-ns hierarchy. > >> >> >> + */ > >> >> >> + if (is_user_ns_controlled(cred->user_ns) && > >> >> >> + is_capability_controlled(cap)) > >> >> >> + return -EPERM; > >> >> > > >> >> > I'd be curious to see the performance impact on this on a regular > >> >> > workload (kernel build?) in a controlled ns. > >> >> > > >> >> Should it affect? If at all, it should be +ve since, the recursive > >> >> user-ns hierarchy lookup is avoided with the above check if the > >> >> capability is controlled. > >> > > >> > Yes but I expect that to be the rare case for normal lxc installs > >> > (which are of course what I am interested in) > >> > > >> >> The additional cost otherwise is this check > >> >> per cap_capable() call. > >> > > >> > And pipeline refetching? > >> > > >> > Capability calls also shouldn't be all that frequent, but still I'm > >> > left wondering... > >> > >> Correct, and capability checks are part of the control-path and not > >> the data-path so shouldn't matter but I guess it doesn't hurt to > >> find-out the number. Do you have any workload in mind, that we can use > >> for this test/benchmark? > > > > I suppose if you did both (a) a kernel build and (b) a webserve > > like https://github.com/m3ng9i/ran , being hit for a minute by a > > heavy load of requests, those two together would be re-assuring. > > > Well, I did (a) and (b). Here are the results. > > (a0) I used the ubuntu-artful (17.10) vm instance with standard kernel > to compile the kernel > > mahesh@mahesh-vm0-artful:~/Work/Linux$ time make -j4 -s clean > mahesh@mahesh-vm0-artful:~/Work/Linux$ time make -j4 -s > real 6m47.525s > user 22m37.424s > sys 2m44.745s > > (b0) Now in an user-namespce create by an user that does not have > SYS_ADMIN (just for apples-to-apples comparison) > mahesh@mahesh-vm0-artful:~$ sysctl -q kernel.controlled_userns_caps_whitelist > sysctl: cannot stat /proc/sys/kernel/controlled_userns_caps_whitelist: > No such file or directory > mahesh@mahesh-vm0-artful:~$ id > uid=1000(mahesh) gid=1000(mahesh) > groups=1000(mahesh),4(adm),24(cdrom),27(sudo),30(dip),46(plugdev),118(lpadmin),128(sambashare) > mahesh@mahesh-vm0-artful:~/Work/Linux$ unshare -Uf -- bash > nobody@mahesh-vm0-artful:~/Work/Linux$ id > uid=65534(nobody) gid=65534(nogroup) groups=65534(nogroup) > nobody@mahesh-vm0-artful:~/Work/Linux$ time make -j4 -s clean > nobody@mahesh-vm0-artful:~/Work/Linux$ time make -j4 -s > real 9m10.115s
Got some serious noise in this run? But the numbers look good - thanks!