Skip to content

Commit

Permalink
io_uring: fix xa_alloc_cycle() error return value check
Browse files Browse the repository at this point in the history
[ upstream commit a30f895 ]

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: 61cf937 ("io_uring: Convert personality_idr to XArray")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
axboe authored and Sasha Levin committed Aug 26, 2021
1 parent 0d5fcfc commit 695ab28
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions fs/io_uring.c
Expand Up @@ -9601,11 +9601,12 @@ static int io_register_personality(struct io_ring_ctx *ctx)

ret = xa_alloc_cyclic(&ctx->personalities, &id, (void *)iod,
XA_LIMIT(0, USHRT_MAX), &ctx->pers_next, GFP_KERNEL);
if (!ret)
return id;
put_cred(iod->creds);
kfree(iod);
return ret;
if (ret < 0) {
put_cred(iod->creds);
kfree(iod);
return ret;
}
return id;
}

static int io_register_restrictions(struct io_ring_ctx *ctx, void __user *arg,
Expand Down

0 comments on commit 695ab28

Please sign in to comment.