shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge 63e6dc6172 ("io_uring: return error pointer from io_mem_alloc()") into android14-6.1-lts

Browse Source 
Steps on the way to 6.1.132

Change-Id: I58d736ef6623940438cfb7ed8866ad939780d942
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-04-08 13:11:40 +00:00
parent bcca1a4a2a 63e6dc6172
commit 468df534e5
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
io_uring/io_uring.c
View File

@@ -2528,8 +2528,12 @@ static void io_mem_free(void *ptr)
static void *io_mem_alloc(size_t size) static void *io_mem_alloc(size_t size)
{ {
gfp_t gfp = GFP_KERNEL_ACCOUNT | __GFP_ZERO | __GFP_NOWARN | __GFP_COMP; gfp_t gfp = GFP_KERNEL_ACCOUNT | __GFP_ZERO | __GFP_NOWARN | __GFP_COMP;
void *ret;
return (void *) __get_free_pages(gfp, get_order(size)); ret = (void *) __get_free_pages(gfp, get_order(size));
if (ret)
return ret;
return ERR_PTR(-ENOMEM);
} }
static unsigned long rings_size(struct io_ring_ctx *ctx, unsigned int sq_entries, static unsigned long rings_size(struct io_ring_ctx *ctx, unsigned int sq_entries,
@@ -3422,6 +3426,7 @@ static __cold int io_allocate_scq_urings(struct io_ring_ctx *ctx,
{ {
struct io_rings *rings; struct io_rings *rings;
size_t size, sq_array_offset; size_t size, sq_array_offset;
void *ptr;
/* make sure these are sane, as we already accounted them */ /* make sure these are sane, as we already accounted them */
ctx->sq_entries = p->sq_entries; ctx->sq_entries = p->sq_entries;
@@ -3432,8 +3437,8 @@ static __cold int io_allocate_scq_urings(struct io_ring_ctx *ctx,
return -EOVERFLOW; return -EOVERFLOW;
rings = io_mem_alloc(size); rings = io_mem_alloc(size);
if (!rings) if (IS_ERR(rings))
return -ENOMEM; return PTR_ERR(rings);
ctx->rings = rings; ctx->rings = rings;
ctx->sq_array = (u32 *)((char *)rings + sq_array_offset); ctx->sq_array = (u32 *)((char *)rings + sq_array_offset);
@@ -3452,13 +3457,14 @@ static __cold int io_allocate_scq_urings(struct io_ring_ctx *ctx,
return -EOVERFLOW; return -EOVERFLOW;
} }
ctx->sq_sqes = io_mem_alloc(size); ptr = io_mem_alloc(size);
if (!ctx->sq_sqes) { if (IS_ERR(ptr)) {
io_mem_free(ctx->rings); io_mem_free(ctx->rings);
ctx->rings = NULL; ctx->rings = NULL;
return -ENOMEM; return PTR_ERR(ptr);
} }
ctx->sq_sqes = ptr;
return 0; return 0;
} }