[CRIU] [PATCH] [v2] test: check non-root shared mounts

[Andrei Vagin]

On Mon, Dec 19, 2016 at 02:27:53PM +0300, Pavel Emelyanov wrote:
> On 12/14/2016 11:00 PM, Andrei Vagin wrote:
> > From: Andrei Vagin <avagin at virtuozzo.com>
> > 
> > The idea of this test is to check non-root shared mounts
> > which lives in a few shared groups.
> > 
> > v2: fix the link description.
> > 
> > Signed-off-by: Andrei Vagin <avagin at virtuozzo.com>
> > ---
> >  test/zdtm/static/Makefile                 |   1 +
> >  test/zdtm/static/mntns_shared_bind03.c    | 124 ++++++++++++++++++++++++++++++
> >  test/zdtm/static/mntns_shared_bind03.desc |   1 +
> 
> Just a test. Do we need any patches to mount.c?

You already commited patches for this test.

> 
> >  3 files changed, 126 insertions(+)
> >  create mode 100644 test/zdtm/static/mntns_shared_bind03.c
> >  create mode 100644 test/zdtm/static/mntns_shared_bind03.desc
> > 
> > diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
> > index 42162f5..ec07303 100644
> > --- a/test/zdtm/static/Makefile
> > +++ b/test/zdtm/static/Makefile
> > @@ -261,6 +261,7 @@ TST_DIR		=				\
> >  		mntns_link_ghost		\
> >  		mntns_shared_bind		\
> >  		mntns_shared_bind02		\
> > +		mntns_shared_bind03		\
> >  		mntns_root_bind			\
> >  		mntns_root_bind02		\
> >  		mntns_overmount			\
> > diff --git a/test/zdtm/static/mntns_shared_bind03.c b/test/zdtm/static/mntns_shared_bind03.c
> > new file mode 100644
> > index 0000000..32d0869
> > --- /dev/null
> > +++ b/test/zdtm/static/mntns_shared_bind03.c
> > @@ -0,0 +1,124 @@
> > +#define _GNU_SOURCE
> > +#include <stdbool.h>
> > +#include <string.h>
> > +#include <fcntl.h>
> > +#include <unistd.h>
> > +#include <signal.h>
> > +#include <stdio.h>
> > +#include <sys/mount.h>
> > +#include <sys/stat.h>
> > +#include <sched.h>
> > +#include <sys/wait.h>
> > +#include <stdlib.h>
> > +#include <limits.h>
> > +
> > +#include "zdtmtst.h"
> > +
> > +#ifndef CLONE_NEWNS
> > +#define CLONE_NEWNS     0x00020000
> > +#endif
> > +
> > +const char *test_doc	= "Check shared non-root bind-mounts with different shared groups";
> > +const char *test_author	= "Andrew Vagin <avagin at gmail.com>";
> > +
> > +char *dirname;
> > +TEST_OPTION(dirname, string, "directory name", 1);
> > +
> > +
> > +int main(int argc, char **argv)
> > +{
> > +	test_init(argc, argv);
> > +
> > +	if (mkdir(dirname, 0700)) {
> > +		pr_perror("mkdir");
> > +		return 1;
> > +	}
> > +
> > +	if (chdir(dirname))
> > +		return 1;
> > +
> > +	if (mkdir("1", 0700) || mkdir("2", 0700) || mkdir("3", 0700)) {
> > +		pr_perror("mkdir");
> > +		return 1;
> > +	}
> > +
> > +	if (mkdir("A", 0700)) {
> > +		pr_perror("mkdir");
> > +		return 1;
> > +	}
> > +
> > +	if (mkdir("B", 0700)) {
> > +		pr_perror("mkdir");
> > +		return 1;
> > +	}
> > +
> > +	if (mount("1", "1", NULL, MS_BIND, NULL) ||
> > +	    mount(NULL, "1", NULL, MS_PRIVATE, NULL) ||
> > +	    mount(NULL, "1", NULL, MS_SHARED, NULL)) {
> > +		pr_perror("mount");
> > +		return 1;
> > +	}
> > +
> > +	if (mount("1", "A", NULL, MS_BIND, NULL) ||
> > +	    mount(NULL, "A", NULL, MS_PRIVATE, NULL) ||
> > +	    mount(NULL, "A", NULL, MS_SHARED, NULL)) {
> > +		pr_perror("mount");
> > +		return 1;
> > +	}
> > +
> > +	if (mount("1", "B", NULL, MS_BIND, NULL) ||
> > +	    mount(NULL, "B", NULL, MS_SLAVE, NULL)) {
> > +		pr_perror("mount");
> > +		return 1;
> > +	}
> > +
> > +	if (mkdir("1/D", 0700)) {
> > +		pr_perror("mkdir");
> > +		return 1;
> > +	}
> > +
> > +	if (mount("1/D", "2", NULL, MS_BIND, NULL)) {
> > +		pr_perror("mount");
> > +		return 1;
> > +	}
> > +
> > +	if (mount("1", "3", NULL, MS_BIND, NULL)) {
> > +		pr_perror("mount");
> > +		return 1;
> > +	}
> > +
> > +	test_daemon();
> > +	test_waitsig();
> > +
> > +	if (mkdir("1/D/test", 0700)) {
> > +		pr_perror("mkdir");
> > +		return 1;
> > +	}
> > +
> > +	if (mount("zdtm_shared", "1/D/test", "tmpfs", 0, NULL)) {
> > +		pr_perror("mount");
> > +		return 1;
> > +	}
> > +
> > +	if (mount(NULL, "3", NULL, MS_PRIVATE, NULL)) {
> > +		pr_perror("mount");
> > +		return 1;
> > +	}
> > +
> > +	if (umount("B/D/test")) {
> > +		pr_perror("umount");
> > +		return 1;
> > +	}
> > +	if (umount("2/test")) {
> > +		pr_perror("umount");
> > +		return 1;
> > +	}
> > +	if (umount("3/D/test")) {
> > +		pr_perror("umount");
> > +		return 1;
> > +	}
> > +
> > +	pass();
> > +
> > +	return 0;
> > +}
> > diff --git a/test/zdtm/static/mntns_shared_bind03.desc b/test/zdtm/static/mntns_shared_bind03.desc
> > new file mode 100644
> > index 0000000..a8849e0
> > --- /dev/null
> > +++ b/test/zdtm/static/mntns_shared_bind03.desc
> > @@ -0,0 +1 @@
> > +{'flavor': 'ns uns', 'flags': 'suid', 'feature': 'mnt_id'}
> > 
>