]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
io_uring: fix xa_alloc_cycle() error return value check
authorJens Axboe <axboe@kernel.dk>
Fri, 20 Aug 2021 20:53:59 +0000 (14:53 -0600)
committerSasha Levin <sashal@kernel.org>
Thu, 26 Aug 2021 12:35:19 +0000 (08:35 -0400)
[ Upstream commit a30f895ad3239f45012e860d4f94c1a388b36d14 ]

We currently check for ret != 0 to indicate error, but '1' is a valid
return and just indicates that the allocation succeeded with a wrap.
Correct the check to be for < 0, like it was before the xarray
conversion.

Cc: stable@vger.kernel.org
Fixes: 61cf93700fe6 ("io_uring: Convert personality_idr to XArray")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/io_uring.c

index 221b80ae831fe8fa38ec8e0c3bc753c6d61c9ce7..9df82eee440a30b17f7cae113b68867646d6c581 100644 (file)
@@ -9835,10 +9835,11 @@ static int io_register_personality(struct io_ring_ctx *ctx)
 
        ret = xa_alloc_cyclic(&ctx->personalities, &id, (void *)creds,
                        XA_LIMIT(0, USHRT_MAX), &ctx->pers_next, GFP_KERNEL);
-       if (!ret)
-               return id;
-       put_cred(creds);
-       return ret;
+       if (ret < 0) {
+               put_cred(creds);
+               return ret;
+       }
+       return id;
 }
 
 static int io_register_restrictions(struct io_ring_ctx *ctx, void __user *arg,