From: Christian Brauner <christianvanbrauner@gmail.com>
Date: Tue, 8 Sep 2015 20:37:14 +0000 (+0200)
Subject: Add bdev_destroy() and bdev_destroy_wrapper()
X-Git-Tag: lxc-2.0.0.beta1~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=339c6f1fb45e2db646376aa4f5ce61fa94f20648;p=thirdparty%2Flxc.git

Add bdev_destroy() and bdev_destroy_wrapper()

static do_bdev_destroy() and bdev_destroy_wrapper() from lxccontainer.c become
public bdev_destroy() and bdev_destroy_wrapper() in bdev.c and bdev.h

Signed-off-by: Christian Brauner <christianvanbrauner@gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c
index 1694adbcb..64e88322a 100644
--- a/src/lxc/bdev.c
+++ b/src/lxc/bdev.c
@@ -3670,3 +3670,40 @@ bool rootfs_is_blockdev(struct lxc_conf *conf)
 		return true;
 	return false;
 }
+
+bool bdev_destroy(struct lxc_conf *conf)
+{
+	struct bdev *r;
+	bool ret = false;
+
+	r = bdev_init(conf, conf->rootfs.path, conf->rootfs.mount, NULL);
+	if (!r)
+		return ret;
+
+	if (r->ops->destroy(r) == 0)
+		ret = true;
+	bdev_put(r);
+
+	return ret;
+}
+
+int bdev_destroy_wrapper(void *data)
+{
+	struct lxc_conf *conf = data;
+
+	if (setgid(0) < 0) {
+		ERROR("Failed to setgid to 0");
+		return -1;
+	}
+	if (setgroups(0, NULL) < 0)
+		WARN("Failed to clear groups");
+	if (setuid(0) < 0) {
+		ERROR("Failed to setuid to 0");
+		return -1;
+	}
+	if (!bdev_destroy(conf))
+		return -1;
+	else
+		return 0;
+}
+
diff --git a/src/lxc/bdev.h b/src/lxc/bdev.h
index 428b3b735..f7b3fcae0 100644
--- a/src/lxc/bdev.h
+++ b/src/lxc/bdev.h
@@ -123,6 +123,9 @@ struct bdev *bdev_copy(struct lxc_container *c0, const char *cname,
 struct bdev *bdev_create(const char *dest, const char *type,
 			const char *cname, struct bdev_specs *specs);
 void bdev_put(struct bdev *bdev);
+bool bdev_destroy(struct lxc_conf *conf);
+/* callback function to be used with userns_exec_1() */
+int bdev_destroy_wrapper(void *data);
 
 /*
  * these are really for qemu-nbd support, as container shutdown