btrfs: fix unprivileged snapshot creation

We already fixed privileged btrfs snapshot creation in:

commit 1c7222c084
Author: Christian Brauner <christian.brauner@ubuntu.com>
Date:   Tue Nov 28 13:51:03 2017 +0100

    btrfs: fix btrfs_snapshot()

    Closes #1956.

    Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
    Signed-off-by: Adrian Reber <areber@redhat.com>

but missed unprivileged btrfs snapshot creation. Fix it too.

Follow-up to #1956.
Closes #2051.

Reported-by: Oleg Freedhom overlayfs@gmail.com
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2017-12-19 11:59:52 +01:00
parent 9668d2cd15
commit 4aaf9b81e9
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D

View File

@ -469,11 +469,11 @@ bool btrfs_create_snapshot(struct lxc_conf *conf, struct lxc_storage *orig,
if (am_unpriv()) { if (am_unpriv()) {
struct rsync_data_char args; struct rsync_data_char args;
args.src = orig->dest; args.src = orig->src;
args.dest = new->dest; args.dest = new->dest;
ret = userns_exec_1(conf, btrfs_snapshot_wrapper, &args, ret = userns_exec_1(conf, btrfs_snapshot_wrapper, &args,
"btrfs_snapshot_wrapper"); "btrfs_snapshot_wrapper");
if (ret < 0) { if (ret < 0) {
ERROR("Failed to run \"btrfs_snapshot_wrapper\""); ERROR("Failed to run \"btrfs_snapshot_wrapper\"");
return false; return false;