----- Original Message -----
> From: "Yuan Sun" <sunyu...@huawei.com>
> To: jstan...@redhat.com
> Cc: ltp-list@lists.sourceforge.net
> Sent: Monday, 20 July, 2015 2:10:21 PM
> Subject: [PATCH] userns02: always set/check GID mapping
> 
> Signed-off-by: Yuan Sun <sunyu...@huawei.com>

Pushed with following text added to commit message:
    The test previously relied on fact that it can always set GID mapping.
    To allow this for unprivileged users on kernels >= 3.19, we have to
    disable setgroups first.

Thanks,
Jan

> ---
>  testcases/kernel/containers/userns/userns02.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/testcases/kernel/containers/userns/userns02.c
> b/testcases/kernel/containers/userns/userns02.c
> index 3bcb97d..e1677b6 100644
> --- a/testcases/kernel/containers/userns/userns02.c
> +++ b/testcases/kernel/containers/userns/userns02.c
> @@ -62,7 +62,6 @@ static int child_fn1(void)
>  static void setup(void)
>  {
>       check_newuser();
> -
>       tst_tmpdir();
>       TST_CHECKPOINT_INIT(NULL);
>  }
> @@ -96,6 +95,14 @@ int main(int argc, char *argv[])
>               fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644);
>               SAFE_WRITE(cleanup, 1, fd, content, strlen(content));
>               SAFE_CLOSE(cleanup, fd);
> +
> +             if (access("/proc/self/setgroups", F_OK) == 0) {
> +                     sprintf(path, "/proc/%d/setgroups", childpid);
> +                     fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644);
> +                     SAFE_WRITE(cleanup, 1, fd, "deny", 4);
> +                     SAFE_CLOSE(cleanup, fd);
> +             }
> +
>               sprintf(path, "/proc/%d/gid_map", childpid);
>               sprintf(content, "100 %d 1", parentgid);
>               fd = SAFE_OPEN(cleanup, path, O_WRONLY, 0644);
> --
> 1.9.1
> 
> 

------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Reply via email to