X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cmds-receive.c;h=62a79850580b852253ac797927f94c914c7f4d98;hb=776cd164b73092ec559a47080ff44aa22bad97a1;hp=da57c9edb2928b7420f8f7eb61a2a95f02113ac7;hpb=a245463281dda8a3f383e66a8429d913e4f50964;p=platform%2Fupstream%2Fbtrfs-progs.git diff --git a/cmds-receive.c b/cmds-receive.c index da57c9e..62a7985 100644 --- a/cmds-receive.c +++ b/cmds-receive.c @@ -17,6 +17,7 @@ */ #include "kerncompat.h" +#include "androidcompat.h" #include #include @@ -25,9 +26,10 @@ #include #include #include -#include +#include #include #include +#include #include #include @@ -56,15 +58,20 @@ struct btrfs_receive int dest_dir_fd; int write_fd; - char *write_path; + char write_path[PATH_MAX]; char *root_path; char *dest_dir_path; /* relative to root_path */ - char *full_subvol_path; + char full_subvol_path[PATH_MAX]; char *full_root_path; int dest_dir_chroot; struct subvol_info cur_subvol; + /* + * Substitute for cur_subvol::path which is a pointer and we cannot + * change it to an array as it's a public API. + */ + char cur_subvol_path[PATH_MAX]; struct subvol_uuid_search sus; @@ -87,15 +94,15 @@ static int finish_subvol(struct btrfs_receive *r) char uuid_str[BTRFS_UUID_UNPARSED_SIZE]; u64 flags; - if (r->cur_subvol.path == NULL) + if (r->cur_subvol_path[0] == 0) return 0; - subvol_fd = openat(r->mnt_fd, r->cur_subvol.path, + subvol_fd = openat(r->mnt_fd, r->cur_subvol_path, O_RDONLY | O_NOATIME); if (subvol_fd < 0) { ret = -errno; - fprintf(stderr, "ERROR: open %s failed. %s\n", - r->cur_subvol.path, strerror(-ret)); + error("cannot open %s: %s\n", + r->cur_subvol_path, strerror(-ret)); goto out; } @@ -112,7 +119,7 @@ static int finish_subvol(struct btrfs_receive *r) ret = ioctl(subvol_fd, BTRFS_IOC_SET_RECEIVED_SUBVOL, &rs_args); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: BTRFS_IOC_SET_RECEIVED_SUBVOL failed. %s\n", + error("ioctl BTRFS_IOC_SET_RECEIVED_SUBVOL failed: %s", strerror(-ret)); goto out; } @@ -121,7 +128,7 @@ static int finish_subvol(struct btrfs_receive *r) ret = ioctl(subvol_fd, BTRFS_IOC_SUBVOL_GETFLAGS, &flags); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: BTRFS_IOC_SUBVOL_GETFLAGS failed. %s\n", + error("ioctl BTRFS_IOC_SUBVOL_GETFLAGS failed: %s", strerror(-ret)); goto out; } @@ -131,17 +138,16 @@ static int finish_subvol(struct btrfs_receive *r) ret = ioctl(subvol_fd, BTRFS_IOC_SUBVOL_SETFLAGS, &flags); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: failed to make subvolume read only. " - "%s\n", strerror(-ret)); + error("failed to make subvolume read only: %s", + strerror(-ret)); goto out; } ret = 0; out: - if (r->cur_subvol.path) { - free(r->cur_subvol.path); - r->cur_subvol.path = NULL; + if (r->cur_subvol_path[0]) { + r->cur_subvol_path[0] = 0; } if (subvol_fd != -1) close(subvol_fd); @@ -160,14 +166,34 @@ static int process_subvol(const char *path, const u8 *uuid, u64 ctransid, if (ret < 0) goto out; - BUG_ON(r->cur_subvol.path); + if (r->cur_subvol.path) { + error("subvol: another one already started, path ptr: %s", + r->cur_subvol.path); + ret = -EINVAL; + goto out; + } + if (r->cur_subvol_path[0]) { + error("subvol: another one already started, path buf: %s", + r->cur_subvol.path); + ret = -EINVAL; + goto out; + } - if (strlen(r->dest_dir_path) == 0) - r->cur_subvol.path = strdup(path); - else - r->cur_subvol.path = path_cat(r->dest_dir_path, path); - free(r->full_subvol_path); - r->full_subvol_path = path_cat3(r->root_path, r->dest_dir_path, path); + if (*r->dest_dir_path == 0) { + strncpy_null(r->cur_subvol_path, path); + } else { + ret = path_cat_out(r->cur_subvol_path, r->dest_dir_path, path); + if (ret < 0) { + error("subvol: path invalid: %s\n", path); + goto out; + } + } + ret = path_cat3_out(r->full_subvol_path, r->root_path, + r->dest_dir_path, path); + if (ret < 0) { + error("subvol: path invalid: %s", path); + goto out; + } fprintf(stderr, "At subvol %s\n", path); @@ -186,8 +212,7 @@ static int process_subvol(const char *path, const u8 *uuid, u64 ctransid, ret = ioctl(r->dest_dir_fd, BTRFS_IOC_SUBVOL_CREATE, &args_v1); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: creating subvolume %s failed. " - "%s\n", path, strerror(-ret)); + error("creating subvolume %s failed: %s", path, strerror(-ret)); goto out; } @@ -209,14 +234,34 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid, if (ret < 0) goto out; - BUG_ON(r->cur_subvol.path); + if (r->cur_subvol.path) { + error("snapshot: another one already started, path ptr: %s", + r->cur_subvol.path); + ret = -EINVAL; + goto out; + } + if (r->cur_subvol_path[0]) { + error("snapshot: another one already started, path buf: %s", + r->cur_subvol.path); + ret = -EINVAL; + goto out; + } - if (strlen(r->dest_dir_path) == 0) - r->cur_subvol.path = strdup(path); - else - r->cur_subvol.path = path_cat(r->dest_dir_path, path); - free(r->full_subvol_path); - r->full_subvol_path = path_cat3(r->root_path, r->dest_dir_path, path); + if (*r->dest_dir_path == 0) { + strncpy_null(r->cur_subvol_path, path); + } else { + ret = path_cat_out(r->cur_subvol_path, r->dest_dir_path, path); + if (ret < 0) { + error("snapshot: path invalid: %s", path); + goto out; + } + } + ret = path_cat3_out(r->full_subvol_path, r->root_path, + r->dest_dir_path, path); + if (ret < 0) { + error("snapshot: path invalid: %s", path); + goto out; + } fprintf(stdout, "At snapshot %s\n", path); @@ -244,7 +289,7 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid, } if (!parent_subvol) { ret = -ENOENT; - fprintf(stderr, "ERROR: could not find parent subvolume\n"); + error("cannot find parent subvolume"); goto out; } @@ -263,8 +308,8 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid, /* First make sure the parent subvol is actually in our path */ if (sub_len < root_len || strstr(parent_subvol->path, r->full_root_path) == NULL) { - fprintf(stderr, "ERROR: parent subvol is not reachable" - " from inside the root subvol.\n"); + error( + "parent subvol is not reachable from inside the root subvol"); ret = -ENOENT; goto out; } @@ -298,7 +343,7 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid, } }*/ - if (strlen(parent_subvol->path) == 0) + if (*parent_subvol->path == 0) args_v2.fd = dup(r->mnt_fd); else args_v2.fd = openat(r->mnt_fd, parent_subvol->path, @@ -306,7 +351,7 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid, if (args_v2.fd < 0) { ret = -errno; if (errno != ENOENT) - fprintf(stderr, "ERROR: open %s failed. %s\n", + error("cannot open %s: %s", parent_subvol->path, strerror(-ret)); else fprintf(stderr, @@ -321,9 +366,8 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid, close(args_v2.fd); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: creating snapshot %s -> %s " - "failed. %s\n", parent_subvol->path, - path, strerror(-ret)); + error("creating snapshot %s -> %s failed: %s", + parent_subvol->path, path, strerror(-ret)); goto out; } @@ -339,7 +383,13 @@ static int process_mkfile(const char *path, void *user) { int ret; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("mkfile: path invalid: %s", path); + goto out; + } if (g_verbose >= 2) fprintf(stderr, "mkfile %s\n", path); @@ -347,15 +397,13 @@ static int process_mkfile(const char *path, void *user) ret = creat(full_path, 0600); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: mkfile %s failed. %s\n", path, - strerror(-ret)); + error("mkfile %s failed: %s", path, strerror(-ret)); goto out; } close(ret); ret = 0; out: - free(full_path); return ret; } @@ -363,7 +411,13 @@ static int process_mkdir(const char *path, void *user) { int ret; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("mkdir: path invalid: %s", path); + goto out; + } if (g_verbose >= 2) fprintf(stderr, "mkdir %s\n", path); @@ -371,11 +425,10 @@ static int process_mkdir(const char *path, void *user) ret = mkdir(full_path, 0700); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: mkdir %s failed. %s\n", path, - strerror(-ret)); + error("mkdir %s failed: %s", path, strerror(-ret)); } - free(full_path); +out: return ret; } @@ -383,7 +436,13 @@ static int process_mknod(const char *path, u64 mode, u64 dev, void *user) { int ret; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("mknod: path invalid: %s", path); + goto out; + } if (g_verbose >= 2) fprintf(stderr, "mknod %s mode=%llu, dev=%llu\n", @@ -392,11 +451,10 @@ static int process_mknod(const char *path, u64 mode, u64 dev, void *user) ret = mknod(full_path, mode & S_IFMT, dev); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: mknod %s failed. %s\n", path, - strerror(-ret)); + error("mknod %s failed: %s", path, strerror(-ret)); } - free(full_path); +out: return ret; } @@ -404,7 +462,13 @@ static int process_mkfifo(const char *path, void *user) { int ret; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("mkfifo: path invalid: %s", path); + goto out; + } if (g_verbose >= 2) fprintf(stderr, "mkfifo %s\n", path); @@ -412,11 +476,10 @@ static int process_mkfifo(const char *path, void *user) ret = mkfifo(full_path, 0600); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: mkfifo %s failed. %s\n", path, - strerror(-ret)); + error("mkfifo %s failed: %s", path, strerror(-ret)); } - free(full_path); +out: return ret; } @@ -424,7 +487,13 @@ static int process_mksock(const char *path, void *user) { int ret; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("mksock: path invalid: %s", path); + goto out; + } if (g_verbose >= 2) fprintf(stderr, "mksock %s\n", path); @@ -432,11 +501,10 @@ static int process_mksock(const char *path, void *user) ret = mknod(full_path, 0600 | S_IFSOCK, 0); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: mknod %s failed. %s\n", path, - strerror(-ret)); + error("mknod %s failed: %s", path, strerror(-ret)); } - free(full_path); +out: return ret; } @@ -444,7 +512,13 @@ static int process_symlink(const char *path, const char *lnk, void *user) { int ret; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("symlink: path invalid: %s", path); + goto out; + } if (g_verbose >= 2) fprintf(stderr, "symlink %s -> %s\n", path, lnk); @@ -452,11 +526,11 @@ static int process_symlink(const char *path, const char *lnk, void *user) ret = symlink(lnk, full_path); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: symlink %s -> %s failed. %s\n", path, + error("symlink %s -> %s failed: %s", path, lnk, strerror(-ret)); } - free(full_path); +out: return ret; } @@ -464,8 +538,20 @@ static int process_rename(const char *from, const char *to, void *user) { int ret; struct btrfs_receive *r = user; - char *full_from = path_cat(r->full_subvol_path, from); - char *full_to = path_cat(r->full_subvol_path, to); + char full_from[PATH_MAX]; + char full_to[PATH_MAX]; + + ret = path_cat_out(full_from, r->full_subvol_path, from); + if (ret < 0) { + error("rename: source path invalid: %s", from); + goto out; + } + + ret = path_cat_out(full_to, r->full_subvol_path, to); + if (ret < 0) { + error("rename: target path invalid: %s", to); + goto out; + } if (g_verbose >= 2) fprintf(stderr, "rename %s -> %s\n", from, to); @@ -473,12 +559,11 @@ static int process_rename(const char *from, const char *to, void *user) ret = rename(full_from, full_to); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: rename %s -> %s failed. %s\n", from, + error("rename %s -> %s failed: %s", from, to, strerror(-ret)); } - free(full_from); - free(full_to); +out: return ret; } @@ -486,8 +571,20 @@ static int process_link(const char *path, const char *lnk, void *user) { int ret; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); - char *full_link_path = path_cat(r->full_subvol_path, lnk); + char full_path[PATH_MAX]; + char full_link_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("link: source path invalid: %s", full_path); + goto out; + } + + ret = path_cat_out(full_link_path, r->full_subvol_path, lnk); + if (ret < 0) { + error("link: target path invalid: %s", full_link_path); + goto out; + } if (g_verbose >= 2) fprintf(stderr, "link %s -> %s\n", path, lnk); @@ -495,12 +592,10 @@ static int process_link(const char *path, const char *lnk, void *user) ret = link(full_link_path, full_path); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: link %s -> %s failed. %s\n", path, - lnk, strerror(-ret)); + error("link %s -> %s failed: %s", path, lnk, strerror(-ret)); } - free(full_path); - free(full_link_path); +out: return ret; } @@ -509,7 +604,13 @@ static int process_unlink(const char *path, void *user) { int ret; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("unlink: path invalid: %s", path); + goto out; + } if (g_verbose >= 2) fprintf(stderr, "unlink %s\n", path); @@ -517,11 +618,10 @@ static int process_unlink(const char *path, void *user) ret = unlink(full_path); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: unlink %s failed. %s\n", path, - strerror(-ret)); + error("unlink %s failed. %s", path, strerror(-ret)); } - free(full_path); +out: return ret; } @@ -529,7 +629,13 @@ static int process_rmdir(const char *path, void *user) { int ret; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("rmdir: path invalid: %s", path); + goto out; + } if (g_verbose >= 2) fprintf(stderr, "rmdir %s\n", path); @@ -537,15 +643,13 @@ static int process_rmdir(const char *path, void *user) ret = rmdir(full_path); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: rmdir %s failed. %s\n", path, - strerror(-ret)); + error("rmdir %s failed: %s", path, strerror(-ret)); } - free(full_path); +out: return ret; } - static int open_inode_for_write(struct btrfs_receive *r, const char *path) { int ret = 0; @@ -560,12 +664,10 @@ static int open_inode_for_write(struct btrfs_receive *r, const char *path) r->write_fd = open(path, O_RDWR); if (r->write_fd < 0) { ret = -errno; - fprintf(stderr, "ERROR: open %s failed. %s\n", path, - strerror(-ret)); + error("cannot open %s: %s", path, strerror(-ret)); goto out; } - free(r->write_path); - r->write_path = strdup(path); + strncpy_null(r->write_path, path); out: return ret; @@ -586,10 +688,16 @@ static int process_write(const char *path, const void *data, u64 offset, { int ret = 0; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; u64 pos = 0; int w; + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("write: path invalid: %s", path); + goto out; + } + ret = open_inode_for_write(r, full_path); if (ret < 0) goto out; @@ -599,7 +707,7 @@ static int process_write(const char *path, const void *data, u64 offset, offset + pos); if (w < 0) { ret = -errno; - fprintf(stderr, "ERROR: writing to %s failed. %s\n", + error("writing to %s failed: %s\n", path, strerror(-ret)); goto out; } @@ -607,7 +715,6 @@ static int process_write(const char *path, const void *data, u64 offset, } out: - free(full_path); return ret; } @@ -620,11 +727,17 @@ static int process_clone(const char *path, u64 offset, u64 len, struct btrfs_receive *r = user; struct btrfs_ioctl_clone_range_args clone_args; struct subvol_info *si = NULL; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; char *subvol_path = NULL; - char *full_clone_path = NULL; + char full_clone_path[PATH_MAX]; int clone_fd = -1; + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("clone: source path invalid: %s", path); + goto out; + } + ret = open_inode_for_write(r, full_path); if (ret < 0) goto out; @@ -635,10 +748,10 @@ static int process_clone(const char *path, u64 offset, u64 len, if (memcmp(clone_uuid, r->cur_subvol.received_uuid, BTRFS_UUID_SIZE) == 0) { /* TODO check generation of extent */ - subvol_path = strdup(r->cur_subvol.path); + subvol_path = strdup(r->cur_subvol_path); } else { ret = -ENOENT; - fprintf(stderr, "ERROR: did not find source subvol.\n"); + error("clone: did not find source subvol"); goto out; } } else { @@ -660,13 +773,16 @@ static int process_clone(const char *path, u64 offset, u64 len, subvol_path = strdup(si->path); } - full_clone_path = path_cat(subvol_path, clone_path); + ret = path_cat_out(full_clone_path, subvol_path, clone_path); + if (ret < 0) { + error("clone: target path invalid: %s", clone_path); + goto out; + } clone_fd = openat(r->mnt_fd, full_clone_path, O_RDONLY | O_NOATIME); if (clone_fd < 0) { ret = -errno; - fprintf(stderr, "ERROR: failed to open %s. %s\n", - full_clone_path, strerror(-ret)); + error("cannot open %s: %s", full_clone_path, strerror(-ret)); goto out; } @@ -675,9 +791,9 @@ static int process_clone(const char *path, u64 offset, u64 len, clone_args.src_length = len; clone_args.dest_offset = offset; ret = ioctl(r->write_fd, BTRFS_IOC_CLONE_RANGE, &clone_args); - if (ret) { + if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: failed to clone extents to %s\n%s\n", + error("failed to clone extents to %s\n%s\n", path, strerror(-ret)); goto out; } @@ -687,8 +803,6 @@ out: free(si->path); free(si); } - free(full_path); - free(full_clone_path); free(subvol_path); if (clone_fd != -1) close(clone_fd); @@ -701,18 +815,22 @@ static int process_set_xattr(const char *path, const char *name, { int ret = 0; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("set_xattr: path invalid: %s", path); + goto out; + } if (strcmp("security.capability", name) == 0) { if (g_verbose >= 3) fprintf(stderr, "set_xattr: cache capabilities\n"); if (r->cached_capabilities_len) - fprintf(stderr, - "WARNING: capabilities set multiple times per file: %s\n", + warning("capabilities set multiple times per file: %s", full_path); if (len > sizeof(r->cached_capabilities)) { - fprintf(stderr, - "ERROR: capabilities encoded to %d bytes, buffer too small\n", + error("capabilities encoded to %d bytes, buffer too small", len); ret = -E2BIG; goto out; @@ -730,13 +848,12 @@ static int process_set_xattr(const char *path, const char *name, ret = lsetxattr(full_path, name, data, len, 0); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: lsetxattr %s %s=%.*s failed. %s\n", + error("lsetxattr %s %s=%.*s failed: %s", path, name, len, (char*)data, strerror(-ret)); goto out; } out: - free(full_path); return ret; } @@ -744,7 +861,13 @@ static int process_remove_xattr(const char *path, const char *name, void *user) { int ret = 0; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("remove_xattr: path invalid: %s", path); + goto out; + } if (g_verbose >= 2) { fprintf(stderr, "remove_xattr %s - name=%s\n", @@ -754,13 +877,12 @@ static int process_remove_xattr(const char *path, const char *name, void *user) ret = lremovexattr(full_path, name); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: lremovexattr %s %s failed. %s\n", + error("lremovexattr %s %s failed: %s", path, name, strerror(-ret)); goto out; } out: - free(full_path); return ret; } @@ -768,7 +890,13 @@ static int process_truncate(const char *path, u64 size, void *user) { int ret = 0; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("truncate: path invalid: %s", path); + goto out; + } if (g_verbose >= 2) fprintf(stderr, "truncate %s size=%llu\n", path, size); @@ -776,13 +904,11 @@ static int process_truncate(const char *path, u64 size, void *user) ret = truncate(full_path, size); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: truncate %s failed. %s\n", - path, strerror(-ret)); + error("truncate %s failed: %s", path, strerror(-ret)); goto out; } out: - free(full_path); return ret; } @@ -790,7 +916,13 @@ static int process_chmod(const char *path, u64 mode, void *user) { int ret = 0; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("chmod: path invalid: %s", path); + goto out; + } if (g_verbose >= 2) fprintf(stderr, "chmod %s - mode=0%o\n", path, (int)mode); @@ -798,13 +930,11 @@ static int process_chmod(const char *path, u64 mode, void *user) ret = chmod(full_path, mode); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: chmod %s failed. %s\n", - path, strerror(-ret)); + error("chmod %s failed: %s", path, strerror(-ret)); goto out; } out: - free(full_path); return ret; } @@ -812,7 +942,13 @@ static int process_chown(const char *path, u64 uid, u64 gid, void *user) { int ret = 0; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; + + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("chown: path invalid: %s", path); + goto out; + } if (g_verbose >= 2) fprintf(stderr, "chown %s - uid=%llu, gid=%llu\n", path, @@ -821,8 +957,7 @@ static int process_chown(const char *path, u64 uid, u64 gid, void *user) ret = lchown(full_path, uid, gid); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: chown %s failed. %s\n", - path, strerror(-ret)); + error("chown %s failed: %s", path, strerror(-ret)); goto out; } @@ -837,14 +972,13 @@ static int process_chown(const char *path, u64 uid, u64 gid, void *user) r->cached_capabilities_len = 0; if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: restoring capabilities %s: %s\n", + error("restoring capabilities %s: %s", path, strerror(-ret)); goto out; } } out: - free(full_path); return ret; } @@ -854,9 +988,15 @@ static int process_utimes(const char *path, struct timespec *at, { int ret = 0; struct btrfs_receive *r = user; - char *full_path = path_cat(r->full_subvol_path, path); + char full_path[PATH_MAX]; struct timespec tv[2]; + ret = path_cat_out(full_path, r->full_subvol_path, path); + if (ret < 0) { + error("utimes: path invalid: %s", path); + goto out; + } + if (g_verbose >= 2) fprintf(stderr, "utimes %s\n", path); @@ -865,13 +1005,12 @@ static int process_utimes(const char *path, struct timespec *at, ret = utimensat(AT_FDCWD, full_path, tv, AT_SYMLINK_NOFOLLOW); if (ret < 0) { ret = -errno; - fprintf(stderr, "ERROR: utimes %s failed. %s\n", + error("utimes %s failed: %s", path, strerror(-ret)); goto out; } out: - free(full_path); return ret; } @@ -920,21 +1059,19 @@ static int do_receive(struct btrfs_receive *r, const char *tomnt, u64 subvol_id; int ret; char *dest_dir_full_path; - char *root_subvol_path; + char root_subvol_path[PATH_MAX]; int end = 0; dest_dir_full_path = realpath(tomnt, NULL); if (!dest_dir_full_path) { ret = -errno; - fprintf(stderr, "ERROR: realpath(%s) failed. %s\n", tomnt, - strerror(-ret)); + error("realpath(%s) failed: %s", tomnt, strerror(-ret)); goto out; } r->dest_dir_fd = open(dest_dir_full_path, O_RDONLY | O_NOATIME); if (r->dest_dir_fd < 0) { ret = -errno; - fprintf(stderr, - "ERROR: failed to open destination directory %s. %s\n", + error("cannot open destination directory %s: %s", dest_dir_full_path, strerror(-ret)); goto out; } @@ -944,16 +1081,14 @@ static int do_receive(struct btrfs_receive *r, const char *tomnt, } else { ret = find_mount_root(dest_dir_full_path, &r->root_path); if (ret < 0) { - fprintf(stderr, - "ERROR: failed to determine mount point for %s: %s\n", + error("failed to determine mount point for %s: %s", dest_dir_full_path, strerror(-ret)); ret = -EINVAL; goto out; } if (ret > 0) { - fprintf(stderr, - "ERROR: %s doesn't belong to btrfs mount point\n", - dest_dir_full_path); + error("%s doesn't belong to btrfs mount point", + dest_dir_full_path); ret = -EINVAL; goto out; } @@ -961,8 +1096,7 @@ static int do_receive(struct btrfs_receive *r, const char *tomnt, r->mnt_fd = open(r->root_path, O_RDONLY | O_NOATIME); if (r->mnt_fd < 0) { ret = -errno; - fprintf(stderr, "ERROR: failed to open %s. %s\n", r->root_path, - strerror(-ret)); + error("cannot open %s: %s", r->root_path, strerror(-ret)); goto out; } @@ -972,24 +1106,14 @@ static int do_receive(struct btrfs_receive *r, const char *tomnt, * subvols we want to receive in. */ ret = btrfs_list_get_path_rootid(r->mnt_fd, &subvol_id); - if (ret) { - fprintf(stderr, "ERROR: couldn't resolve our subvolid %d\n", - ret); + if (ret) goto out; - } - - root_subvol_path = malloc(PATH_MAX); - if (!root_subvol_path) { - ret = -ENOMEM; - fprintf(stderr, "ERROR: couldn't allocate buffer for the root " - "subvol path\n"); - goto out; - } + root_subvol_path[0] = 0; ret = btrfs_subvolid_resolve(r->mnt_fd, root_subvol_path, PATH_MAX, subvol_id); if (ret) { - fprintf(stderr, "ERROR: couldn't resolve our subvol path\n"); + error("cannot resolve our subvol path"); goto out; } @@ -997,24 +1121,19 @@ static int do_receive(struct btrfs_receive *r, const char *tomnt, * Ok we're inside of a subvol off of the root subvol, we need to * actually set full_root_path. */ - if (strlen(root_subvol_path)) + if (*root_subvol_path) r->full_root_path = root_subvol_path; - else - free(root_subvol_path); if (r->dest_dir_chroot) { if (chroot(dest_dir_full_path)) { ret = -errno; - fprintf(stderr, - "ERROR: failed to chroot to %s, %s\n", - dest_dir_full_path, - strerror(-ret)); + error("failed to chroot to %s: %s", + dest_dir_full_path, strerror(-ret)); goto out; } if (chdir("/")) { ret = -errno; - fprintf(stderr, - "ERROR: failed to chdir to /, %s\n", + error("failed to chdir to / after chroot: %s", strerror(-ret)); goto out; } @@ -1065,18 +1184,12 @@ out: close(r->write_fd); r->write_fd = -1; } - free(r->root_path); + + if (r->root_path != realmnt) + free(r->root_path); r->root_path = NULL; - free(r->write_path); - r->write_path = NULL; - free(r->full_subvol_path); - r->full_subvol_path = NULL; r->dest_dir_path = NULL; free(dest_dir_full_path); - if (r->cur_subvol.path) { - free(r->cur_subvol.path); - r->cur_subvol.path = NULL; - } subvol_uuid_search_finit(&r->sus); if (r->mnt_fd != -1) { close(r->mnt_fd); @@ -1086,10 +1199,7 @@ out: close(r->dest_dir_fd); r->dest_dir_fd = -1; } - if (r->full_root_path) { - free(r->full_root_path); - r->full_root_path = NULL; - } + return ret; } @@ -1129,9 +1239,8 @@ int cmd_receive(int argc, char **argv) break; case 'f': if (arg_copy_path(fromfile, optarg, sizeof(fromfile))) { - fprintf(stderr, - "ERROR: input file path too long (%zu)\n", - strlen(optarg)); + error("input file path too long (%zu)", + strlen(optarg)); ret = 1; goto out; } @@ -1147,16 +1256,15 @@ int cmd_receive(int argc, char **argv) break; case 'm': if (arg_copy_path(realmnt, optarg, sizeof(realmnt))) { - fprintf(stderr, - "ERROR: mount point path too long (%zu)\n", - strlen(optarg)); + error("mount point path too long (%zu)", + strlen(optarg)); ret = 1; goto out; } break; case '?': default: - fprintf(stderr, "ERROR: receive args invalid.\n"); + error("receive args invalid"); return 1; } } @@ -1169,12 +1277,14 @@ int cmd_receive(int argc, char **argv) if (fromfile[0]) { receive_fd = open(fromfile, O_RDONLY | O_NOATIME); if (receive_fd < 0) { - fprintf(stderr, "ERROR: failed to open %s\n", fromfile); + error("cannot open %s: %s", fromfile, strerror(errno)); goto out; } } ret = do_receive(&r, tomnt, realmnt, receive_fd, max_errors); + if (receive_fd != fileno(stdin)) + close(receive_fd); out: