We may have a case, when VE is dead, but there are some users of it,
overlayfs superblock for example.

This user may want to use VE creds, so we need to keep ve->init_cred alive.
Drop creds in ve_destroy. We need to drop ve_nsproxy early because
ploop waits for refcount going to zero, dropping ve_nsproxy in destroy
causes CT suspend/resume hangs.

This commit changes ve->init_cred == NULL meaning. Now it means
that VE is not started. Dead VE keeps its cred.

https://virtuozzo.atlassian.net/browse/VSTOR-142405
Signed-off-by: Vladimir Riabchun <[email protected]>
---
 kernel/capability.c      | 4 ++--
 kernel/ve/ve.c           | 4 ++++
 net/netlink/af_netlink.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/kernel/capability.c b/kernel/capability.c
index 6de4dcba2283..68c3d5288ba7 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -395,7 +395,7 @@ bool ve_capable(int cap)
        rcu_read_lock();
        cred = ve->init_cred;
 
-       if (cred == NULL) /* ve isn't running */
+       if (cred == NULL) /* ve isn't started */
                cred = ve0.init_cred;
 
        ret = ns_capable(cred->user_ns, cap);
@@ -413,7 +413,7 @@ bool ve_capable_noaudit(int cap)
        rcu_read_lock();
        cred = ve->init_cred;
 
-       if (cred == NULL) /* ve isn't running */
+       if (cred == NULL) /* ve isn't started */
                cred = ve0.init_cred;
 
        ret = ns_capable_noaudit(cred->user_ns, cap);
diff --git a/kernel/ve/ve.c b/kernel/ve/ve.c
index d3f02fe118ca..de7fe776d4e6 100644
--- a/kernel/ve/ve.c
+++ b/kernel/ve/ve.c
@@ -378,7 +378,10 @@ static void ve_drop_context(struct ve_struct *ve)
        rcu_assign_pointer(ve->ve_nsproxy, NULL);
        synchronize_rcu();
        put_nsproxy(ve_nsproxy);
+}
 
+static void ve_drop_cred(struct ve_struct *ve)
+{
        put_cred(ve->init_cred);
        ve->init_cred = NULL;
 }
@@ -919,6 +922,7 @@ static void ve_destroy(struct cgroup_subsys_state *css)
 {
        struct ve_struct *ve = css_to_ve(css);
 
+       ve_drop_cred(ve);
        free_ve_devmnts(ve);
 
        kmapset_unlink(&ve->sysfs_perms_key, &sysfs_ve_perms_set);
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index f686e6ea30ce..c4a25ec2a15e 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -887,7 +887,7 @@ bool netlink_ve_capable(const struct sk_buff *skb, int cap)
 {
        struct cred *cred = get_exec_env()->init_cred;
 
-       if (cred == NULL) /* ve isn't running */
+       if (cred == NULL) /* ve isn't started */
                cred = ve0.init_cred;
 
        return netlink_ns_capable(skb, cred->user_ns, cap);

-- 
2.52.0

_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to