| Message ID | 5ed268d3-a997-4f64-bd71-47faa92101ab@moroto.mountain (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | io_uring/kbuf: Fix an NULL vs IS_ERR() bug in io_alloc_pbuf_ring() | expand |
On Tue, 05 Dec 2023 15:37:17 +0300, Dan Carpenter wrote: > The io_mem_alloc() function returns error pointers, not NULL. Update > the check accordingly. > > Applied, thanks! [1/1] io_uring/kbuf: Fix an NULL vs IS_ERR() bug in io_alloc_pbuf_ring() commit: e53f7b54b1fdecae897f25002ff0cff04faab228 Best regards,
diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c index 268788305b61..bd25bc2deeaf 100644 --- a/io_uring/kbuf.c +++ b/io_uring/kbuf.c @@ -636,8 +636,8 @@ static int io_alloc_pbuf_ring(struct io_ring_ctx *ctx, ibf = io_lookup_buf_free_entry(ctx, ring_size); if (!ibf) { ptr = io_mem_alloc(ring_size); - if (!ptr) - return -ENOMEM; + if (IS_ERR(ptr)) + return PTR_ERR(ptr); /* Allocate and store deferred free entry */ ibf = kmalloc(sizeof(*ibf), GFP_KERNEL_ACCOUNT);
The io_mem_alloc() function returns error pointers, not NULL. Update the check accordingly. Fixes: b10b73c102a2 ("io_uring/kbuf: recycle freed mapped buffer ring entries") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- io_uring/kbuf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)