Update bcachefs sources to 0d63ed13ea3d closures: Fix race in closure_sync()

[bcachefs-tools-debian] / libbcachefs / chardev.c

diff --git a/libbcachefs/chardev.c b/libbcachefs/chardev.c
index aa26588ed5edf0e193c10cc7e3d6a0d25f49a8e9..4bb88aefed121f275582df94e3cea9dcdec7c58c 100644 (file)
--- a/libbcachefs/chardev.c
+++ b/libbcachefs/chardev.c
@@ -86,10 +86,9 @@ static long bch2_ioctl_assemble(struct bch_ioctl_assemble __user *user_arg)
                devs[i] = strndup_user((const char __user *)(unsigned long)
                                       user_devs[i],
                                       PATH_MAX);
-               if (!devs[i]) {
-                       ret = -ENOMEM;
+               ret= PTR_ERR_OR_ZERO(devs[i]);
+               if (ret)
                        goto err;
-               }
        }
 
        c = bch2_fs_open(devs, arg.nr_devs, bch2_opts_empty());
@@ -117,8 +116,9 @@ static long bch2_ioctl_incremental(struct bch_ioctl_incremental __user *user_arg
                return -EINVAL;
 
        path = strndup_user((const char __user *)(unsigned long) arg.dev, PATH_MAX);
-       if (!path)
-               return -ENOMEM;
+       ret = PTR_ERR_OR_ZERO(path);
+       if (ret)
+               return ret;
 
        err = bch2_fs_open_incremental(path);
        kfree(path);
@@ -149,9 +149,10 @@ static long bch2_global_ioctl(unsigned cmd, void __user *arg)
 static long bch2_ioctl_query_uuid(struct bch_fs *c,
                        struct bch_ioctl_query_uuid __user *user_arg)
 {
-       return copy_to_user(&user_arg->uuid,
-                           &c->sb.user_uuid,
-                           sizeof(c->sb.user_uuid));
+       if (copy_to_user(&user_arg->uuid, &c->sb.user_uuid,
+                        sizeof(c->sb.user_uuid)))
+               return -EFAULT;
+       return 0;
 }
 
 #if 0
@@ -188,8 +189,9 @@ static long bch2_ioctl_disk_add(struct bch_fs *c, struct bch_ioctl_disk arg)
                return -EINVAL;
 
        path = strndup_user((const char __user *)(unsigned long) arg.dev, PATH_MAX);
-       if (!path)
-               return -ENOMEM;
+       ret = PTR_ERR_OR_ZERO(path);
+       if (ret)
+               return ret;
 
        ret = bch2_dev_add(c, path);
        kfree(path);
@@ -230,8 +232,9 @@ static long bch2_ioctl_disk_online(struct bch_fs *c, struct bch_ioctl_disk arg)
                return -EINVAL;
 
        path = strndup_user((const char __user *)(unsigned long) arg.dev, PATH_MAX);
-       if (!path)
-               return -ENOMEM;
+       ret = PTR_ERR_OR_ZERO(path);
+       if (ret)
+               return ret;
 
        ret = bch2_dev_online(c, path);
        kfree(path);
@@ -284,6 +287,8 @@ static long bch2_ioctl_disk_set_state(struct bch_fs *c,
                return PTR_ERR(ca);
 
        ret = bch2_dev_set_state(c, ca, arg.new_state, arg.flags);
+       if (ret)
+               bch_err(c, "Error setting device state: %s", bch2_err_str(ret));
 
        percpu_ref_put(&ca->ref);
        return ret;
@@ -327,8 +332,8 @@ static ssize_t bch2_data_job_read(struct file *file, char __user *buf,
        struct bch_ioctl_data_event e = {
                .type                   = BCH_DATA_EVENT_PROGRESS,
                .p.data_type            = ctx->stats.data_type,
-               .p.btree_id             = ctx->stats.btree_id,
-               .p.pos                  = ctx->stats.pos,
+               .p.btree_id             = ctx->stats.pos.btree,
+               .p.pos                  = ctx->stats.pos.pos,
                .p.sectors_done         = atomic64_read(&ctx->stats.sectors_seen),
                .p.sectors_total        = bch2_fs_usage_read_short(c).used,
        };
@@ -336,7 +341,10 @@ static ssize_t bch2_data_job_read(struct file *file, char __user *buf,
        if (len < sizeof(e))
                return -EINVAL;
 
-       return copy_to_user(buf, &e, sizeof(e)) ?: sizeof(e);
+       if (copy_to_user(buf, &e, sizeof(e)))
+               return -EFAULT;
+
+       return sizeof(e);
 }
 
 static const struct file_operations bcachefs_data_ops = {
@@ -415,7 +423,7 @@ static long bch2_ioctl_fs_usage(struct bch_fs *c,
        if (get_user(replica_entries_bytes, &user_arg->replica_entries_bytes))
                return -EFAULT;
 
-       arg = kzalloc(sizeof(*arg) + replica_entries_bytes, GFP_KERNEL);
+       arg = kzalloc(size_add(sizeof(*arg), replica_entries_bytes), GFP_KERNEL);
        if (!arg)
                return -ENOMEM;
 
@@ -464,9 +472,11 @@ static long bch2_ioctl_fs_usage(struct bch_fs *c,
        percpu_up_read(&c->mark_lock);
        kfree(src);
 
-       if (!ret)
-               ret = copy_to_user(user_arg, arg,
-                       sizeof(*arg) + arg->replica_entries_bytes);
+       if (ret)
+               goto err;
+       if (copy_to_user(user_arg, arg,
+                        sizeof(*arg) + arg->replica_entries_bytes))
+               ret = -EFAULT;
 err:
        kfree(arg);
        return ret;
@@ -501,18 +511,20 @@ static long bch2_ioctl_dev_usage(struct bch_fs *c,
        arg.state               = ca->mi.state;
        arg.bucket_size         = ca->mi.bucket_size;
        arg.nr_buckets          = ca->mi.nbuckets - ca->mi.first_bucket;
-       arg.available_buckets   = arg.nr_buckets - src.buckets_unavailable;
-       arg.ec_buckets          = src.buckets_ec;
-       arg.ec_sectors          = 0;
+       arg.buckets_ec          = src.buckets_ec;
 
        for (i = 0; i < BCH_DATA_NR; i++) {
-               arg.buckets[i] = src.d[i].buckets;
-               arg.sectors[i] = src.d[i].sectors;
+               arg.d[i].buckets        = src.d[i].buckets;
+               arg.d[i].sectors        = src.d[i].sectors;
+               arg.d[i].fragmented     = src.d[i].fragmented;
        }
 
        percpu_ref_put(&ca->ref);
 
-       return copy_to_user(user_arg, &arg, sizeof(arg));
+       if (copy_to_user(user_arg, &arg, sizeof(arg)))
+               return -EFAULT;
+
+       return 0;
 }
 
 static long bch2_ioctl_read_super(struct bch_fs *c,
@@ -549,8 +561,9 @@ static long bch2_ioctl_read_super(struct bch_fs *c,
                goto err;
        }
 
-       ret = copy_to_user((void __user *)(unsigned long)arg.sb,
-                          sb, vstruct_bytes(sb));
+       if (copy_to_user((void __user *)(unsigned long)arg.sb, sb,
+                        vstruct_bytes(sb)))
+               ret = -EFAULT;
 err:
        if (!IS_ERR_OR_NULL(ca))
                percpu_ref_put(&ca->ref);
@@ -577,7 +590,7 @@ static long bch2_ioctl_disk_get_idx(struct bch_fs *c,
                        return i;
                }
 
-       return -ENOENT;
+       return -BCH_ERR_ENOENT_dev_idx_not_found;
 }
 
 static long bch2_ioctl_disk_resize(struct bch_fs *c,
@@ -616,6 +629,9 @@ static long bch2_ioctl_disk_resize_journal(struct bch_fs *c,
            arg.pad)
                return -EINVAL;
 
+       if (arg.nbuckets > U32_MAX)
+               return -EINVAL;
+
        ca = bch2_device_lookup(c, arg.dev, arg.flags);
        if (IS_ERR(ca))
                return PTR_ERR(ca);
@@ -632,11 +648,14 @@ do {                                                                      \
                                                                        \
        if (copy_from_user(&i, arg, sizeof(i)))                         \
                return -EFAULT;                                         \
-       return bch2_ioctl_##_name(c, i);                                \
+       ret = bch2_ioctl_##_name(c, i);                                 \
+       goto out;                                                       \
 } while (0)
 
 long bch2_fs_ioctl(struct bch_fs *c, unsigned cmd, void __user *arg)
 {
+       long ret;
+
        switch (cmd) {
        case BCH_IOCTL_QUERY_UUID:
                return bch2_ioctl_query_uuid(c, arg);
@@ -680,6 +699,10 @@ long bch2_fs_ioctl(struct bch_fs *c, unsigned cmd, void __user *arg)
        default:
                return -ENOTTY;
        }
+out:
+       if (ret < 0)
+               ret = bch2_err_class(ret);
+       return ret;
 }
 
 static DEFINE_IDR(bch_chardev_minor);
@@ -745,7 +768,7 @@ int __init bch2_chardev_init(void)
        if (bch_chardev_major < 0)
                return bch_chardev_major;
 
-       bch_chardev_class = class_create(THIS_MODULE, "bcachefs");
+       bch_chardev_class = class_create("bcachefs");
        if (IS_ERR(bch_chardev_class))
                return PTR_ERR(bch_chardev_class);