loop: fix LOOP_GET_STATUS lock imbalance

Commit 2d1d4c1e591f made loop_get_status() drop lo_ctx_mutex before
returning, but the loop_get_status_old(), loop_get_status64(), and
loop_get_status_compat() wrappers don't call loop_get_status() if the
passed argument is NULL. The callers expect that the lock is dropped, so
make sure we drop it in that case, too.

Reported-by: syzbot+31e8daa8b3fc129e75f2@syzkaller.appspotmail.com
Fixes: 2d1d4c1e591f ("loop: don't call into filesystem while holding lo_ctl_mutex")
Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index e5fc020ccedac01d105a34dac30fbf6e6434d5cd..c9d04497a415c436b8486630d9b3c5a0812d19d2 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1287,12 +1287,13 @@ static int
 loop_get_status_old(struct loop_device *lo, struct loop_info __user *arg) {
        struct loop_info info;
        struct loop_info64 info64;
-       int err = 0;
+       int err;
 
-       if (!arg)
-               err = -EINVAL;
-       if (!err)
-               err = loop_get_status(lo, &info64);
+       if (!arg) {
+               mutex_unlock(&lo->lo_ctl_mutex);
+               return -EINVAL;
+       }
+       err = loop_get_status(lo, &info64);
        if (!err)
                err = loop_info64_to_old(&info64, &info);
        if (!err && copy_to_user(arg, &info, sizeof(info)))
@@ -1304,12 +1305,13 @@ loop_get_status_old(struct loop_device *lo, struct loop_info __user *arg) {
 static int
 loop_get_status64(struct loop_device *lo, struct loop_info64 __user *arg) {
        struct loop_info64 info64;
-       int err = 0;
+       int err;
 
-       if (!arg)
-               err = -EINVAL;
-       if (!err)
-               err = loop_get_status(lo, &info64);
+       if (!arg) {
+               mutex_unlock(&lo->lo_ctl_mutex);
+               return -EINVAL;
+       }
+       err = loop_get_status(lo, &info64);
        if (!err && copy_to_user(arg, &info64, sizeof(info64)))
                err = -EFAULT;
 
@@ -1533,12 +1535,13 @@ loop_get_status_compat(struct loop_device *lo,
                       struct compat_loop_info __user *arg)
 {
        struct loop_info64 info64;
-       int err = 0;
+       int err;
 
-       if (!arg)
-               err = -EINVAL;
-       if (!err)
-               err = loop_get_status(lo, &info64);
+       if (!arg) {
+               mutex_unlock(&lo->lo_ctl_mutex);
+               return -EINVAL;
+       }
+       err = loop_get_status(lo, &info64);
        if (!err)
                err = loop_info64_to_compat(&info64, arg);
        return err;