Merge branch 'io_uring-6.17' into for-next

axboe · axboe · commit 1dabe7137bd7 · 2025-08-08T06:44:34.000-06:00
* io_uring-6.17:
  io_uring/memmap: cast nr_pages to size_t before shifting
diff --git a/io_uring/memmap.c b/io_uring/memmap.c
@@ -156,7 +156,7 @@ static int io_region_allocate_pages(struct io_ring_ctx *ctx,
 				    unsigned long mmap_offset)
 {
 	gfp_t gfp = GFP_KERNEL_ACCOUNT | __GFP_ZERO | __GFP_NOWARN;
-	unsigned long size = mr->nr_pages << PAGE_SHIFT;
+	size_t size = (size_t) mr->nr_pages << PAGE_SHIFT;
 	unsigned long nr_allocated;
 	struct page **pages;
 	void *p;

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ static int io_region_allocate_pages(struct io_ring_ctx *ctx,`
`156`	`156`	`unsigned long mmap_offset)`
`157`	`157`	`{`
`158`	`158`	`gfp_t gfp = GFP_KERNEL_ACCOUNT \| __GFP_ZERO \| __GFP_NOWARN;`
`159`		`- unsigned long size = mr->nr_pages << PAGE_SHIFT;`
	`159`	`+ size_t size = (size_t) mr->nr_pages << PAGE_SHIFT;`
`160`	`160`	`unsigned long nr_allocated;`
`161`	`161`	`struct page **pages;`
`162`	`162`	`void *p;`