btrfs-progs: check: punch_extent_hole in lowmem

[platform/upstream/btrfs-progs.git] / send-utils.c

diff --git a/send-utils.c b/send-utils.c
index 252ca6d..384cc5b 100644 (file)
--- a/send-utils.c
+++ b/send-utils.c
@@ -439,6 +439,19 @@ struct subvol_info *subvol_uuid_search(struct subvol_uuid_search *s,
                                       const char *path,
                                       enum subvol_search_type type)
 {
+       struct subvol_info *si;
+
+       si = subvol_uuid_search2(s, root_id, uuid, transid, path, type);
+       if (IS_ERR(si))
+               return NULL;
+       return si;
+}
+
+struct subvol_info *subvol_uuid_search2(struct subvol_uuid_search *s,
+                                      u64 root_id, const u8 *uuid, u64 transid,
+                                      const char *path,
+                                      enum subvol_search_type type)
+{
        int ret = 0;
        struct btrfs_root_item root_item;
        struct subvol_info *info = NULL;
@@ -474,6 +487,10 @@ struct subvol_info *subvol_uuid_search(struct subvol_uuid_search *s,
                goto out;
 
        info = calloc(1, sizeof(*info));
+       if (!info) {
+               ret = -ENOMEM;
+               goto out;
+       }
        info->root_id = root_id;
        memcpy(info->uuid, root_item.uuid, BTRFS_UUID_SIZE);
        memcpy(info->received_uuid, root_item.received_uuid, BTRFS_UUID_SIZE);
@@ -484,6 +501,10 @@ struct subvol_info *subvol_uuid_search(struct subvol_uuid_search *s,
        info->rtransid = btrfs_root_rtransid(&root_item);
        if (type == subvol_search_by_path) {
                info->path = strdup(path);
+               if (!info->path) {
+                       ret = -ENOMEM;
+                       goto out;
+               }
        } else {
                info->path = malloc(PATH_MAX);
                if (!info->path) {
@@ -495,9 +516,11 @@ struct subvol_info *subvol_uuid_search(struct subvol_uuid_search *s,
        }
 
 out:
-       if (ret && info) {
-               free(info->path);
-               free(info);
+       if (ret) {
+               if (info) {
+                       free(info->path);
+                       free(info);
+               }
                return ERR_PTR(ret);
        }