Overlayfs superblock stores creator creds in it, but these creds should go together with the VE they were taken from.
Store the VE in the superblock. We can't use mount->owner_ve, because several mounts can reference one superblock. https://virtuozzo.atlassian.net/browse/VSTOR-142405 Signed-off-by: Vladimir Riabchun <[email protected]> --- fs/overlayfs/ovl_entry.h | 1 + fs/overlayfs/params.c | 3 +++ fs/overlayfs/super.c | 3 +++ 3 files changed, 7 insertions(+) diff --git a/fs/overlayfs/ovl_entry.h b/fs/overlayfs/ovl_entry.h index ab78001635e7..a6ad8b8de48c 100644 --- a/fs/overlayfs/ovl_entry.h +++ b/fs/overlayfs/ovl_entry.h @@ -77,6 +77,7 @@ struct ovl_fs { struct ovl_config config; /* creds of process who forced instantiation of super block */ const struct cred *creator_cred; + struct ve_struct *creator_ve; bool tmpfile; bool noxattr; bool nofh; diff --git a/fs/overlayfs/params.c b/fs/overlayfs/params.c index 32c58fcfe52f..c047f1265b8e 100644 --- a/fs/overlayfs/params.c +++ b/fs/overlayfs/params.c @@ -8,6 +8,7 @@ #include <linux/posix_acl_xattr.h> #include <linux/seq_file.h> #include <linux/xattr.h> +#include <linux/ve.h> #include "overlayfs.h" #include "params.h" @@ -761,6 +762,8 @@ void ovl_free_fs(struct ovl_fs *ofs) kfree(ofs->config.workdir); if (ofs->creator_cred) put_cred(ofs->creator_cred); + if (ofs->creator_ve) + put_ve(ofs->creator_ve); kfree(ofs); } diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index fb47711c8fb9..8ab39a35a873 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -18,6 +18,7 @@ #include <linux/file.h> #include <linux/fs_context.h> #include <linux/fs_parser.h> +#include <linux/ve.h> #include "overlayfs.h" #include "params.h" @@ -1328,6 +1329,8 @@ int ovl_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_d_op = &ovl_dentry_operations; + ofs->creator_ve = get_ve(get_exec_env()); + err = -ENOMEM; ofs->creator_cred = cred = prepare_creds(); if (!cred) -- 2.52.0 _______________________________________________ Devel mailing list [email protected] https://lists.openvz.org/mailman/listinfo/devel
