diff options
| author | Jens Axboe <axboe@kernel.dk> | 2021-08-20 14:53:59 -0600 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2021-08-26 08:35:19 -0400 |
| commit | a57b2a703e4440b9490cc8888618af9b05f2b457 (patch) | |
| tree | f8a8e9e53ab10ee80532911585aa944c52a37043 /fs | |
| parent | 515b6124df6a84c957c5cc6bb6e8309dae7b1e9c (diff) | |
io_uring: fix xa_alloc_cycle() error return value check
[ 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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 221b80ae831f..9df82eee440a 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -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, |