From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 15 Aug 2025 16:49:18 +0000 (+0200)
Subject: fix up queue-6.16/io_uring-zcrx-account-area-memory.patch
X-Git-Tag: v6.12.43~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7197e56a4d01c4c5c302dd114feabbe612ac0f4f;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up queue-6.16/io_uring-zcrx-account-area-memory.patch
---

diff --git a/queue-6.16/io_uring-zcrx-account-area-memory.patch b/queue-6.16/io_uring-zcrx-account-area-memory.patch
index 4f49bc885c..61e19ed627 100644
--- a/queue-6.16/io_uring-zcrx-account-area-memory.patch
+++ b/queue-6.16/io_uring-zcrx-account-area-memory.patch
@@ -18,13 +18,13 @@ Link: https://lore.kernel.org/r/4b53f0c575bd062f63d12bec6cac98037fc66aeb.1752699
 Signed-off-by: Jens Axboe <axboe@kernel.dk>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- io_uring/zcrx.c |   27 +++++++++++++++++++++++++++
+ io_uring/zcrx.c |   29 ++++++++++++++++++++++++++++-
  io_uring/zcrx.h |    1 +
- 2 files changed, 28 insertions(+)
+ 2 files changed, 29 insertions(+), 1 deletion(-)
 
 --- a/io_uring/zcrx.c
 +++ b/io_uring/zcrx.c
-@@ -152,6 +152,23 @@ static int io_zcrx_map_area_dmabuf(struc
+@@ -152,12 +152,29 @@ static int io_zcrx_map_area_dmabuf(struc
  	return niov_idx;
  }
  
@@ -48,6 +48,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static int io_import_umem(struct io_zcrx_ifq *ifq,
  			  struct io_zcrx_mem *mem,
  			  struct io_uring_zcrx_area_reg *area_reg)
+ {
+ 	struct page **pages;
+-	int nr_pages;
++	int nr_pages, ret;
+ 
+ 	if (area_reg->dmabuf_fd)
+ 		return -EINVAL;
 @@ -168,6 +185,13 @@ static int io_import_umem(struct io_zcrx
  	if (IS_ERR(pages))
  		return PTR_ERR(pages);