Skip to contentSkip to conversation

ublk: use unchecked copy helpers for bio page data

PATCH In review Ming Lei 3 participants 4 messages Apr 1

Subsystems (2)
lore
Share & tools
lore

Ming Lei

author
#0 lore raw

PATCH v2 1/1 ublk: use unchecked copy helpers for bio page data

Bio pages may originate from slab caches that lack a usercopy region (e.g. jbd2 frozen metadata buffers allocated via jbd2_alloc()). When CONFIG_HARDENED_USERCOPY is enabled, copy_to_iter() calls check_copy_size() which rejects these slab pages, triggering a kernel BUG in usercopy_abort().

This is a false positive: the data is ordinary block I/O content — the same data the loop/nbd driver writes to its backing file via vfs_iter_write(). The bvec length is always trusted, so the size check in check_copy_size() is not needed either.

Switch to _copy_to_iter()/_copy_from_iter() which skip the check_copy_size() wrapper while the underlying copy_to_user() remains unchanged.

Fixes 2299ceec364e ("ublk: use copy_{to,from}_iter() for user copy")

---
V2:
- update commit log (Caleb Sander Mateos)

 drivers/block/ublk_drv.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/block/ublk_drv.c +10 -2
index 2e475bdc54dd..3e329906ae19 100644
@@ -1322,10 +1322,18 @@ static bool ublk_copy_user_bvec(const struct bio_vec *bv, unsigned *offset,
 
 	len = bv->bv_len - *offset;
 	bv_buf = kmap_local_page(bv->bv_page) + bv->bv_offset + *offset;
+	/*
+	 * Bio pages may originate from slab caches without a usercopy region
+	 * (e.g. jbd2 frozen metadata buffers).  This is the same data that
+	 * the loop driver writes to its backing file — no exposure risk.
+	 * The bvec length is always trusted, so the size check in
+	 * check_copy_size() is not needed either.  Use the unchecked
+	 * helpers to avoid false positives on slab pages.
+	 */
 	if (dir == ITER_DEST)
-		copied = copy_to_iter(bv_buf, len, uiter);
+		copied = _copy_to_iter(bv_buf, len, uiter);
 	else
-		copied = copy_from_iter(bv_buf, len, uiter);
+		copied = _copy_from_iter(bv_buf, len, uiter);
 
 	kunmap_local(bv_buf);
 
Signature · 1 line
2.53.0
Acked-by on v2 1/1
#1 lore raw
Quoted 12 lines · Ming Lei

Bio pages may originate from slab caches that lack a usercopy region (e.g. jbd2 frozen metadata buffers allocated via jbd2_alloc()). When CONFIG_HARDENED_USERCOPY is enabled, copy_to_iter() calls check_copy_size() which rejects these slab pages, triggering a kernel BUG in usercopy_abort().

This is a false positive: the data is ordinary block I/O content — the same data the loop/nbd driver writes to its backing file via vfs_iter_write(). The bvec length is always trusted, so the size check in check_copy_size() is not needed either.

Quoted 6 lines

Switch to _copy_to_iter()/_copy_from_iter() which skip the check_copy_size() wrapper while the underlying copy_to_user() remains unchanged.

Fixes 2299ceec364e ("ublk: use copy_{to,from}_iter() for user copy")
Quoted 35 lines

---
V2:
- update commit log (Caleb Sander Mateos)

 drivers/block/ublk_drv.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/block/ublk_drv.c +10 -3
index 2e475bdc54dd..3e329906ae19 100644
@@ -1322,10 +1322,18 @@ static bool ublk_copy_user_bvec(const struct bio_vec *bv, unsigned *offset,
 
        len = bv->bv_len - *offset;
        bv_buf = kmap_local_page(bv->bv_page) + bv->bv_offset + *offset;
+       /*
+        * Bio pages may originate from slab caches without a usercopy region
+        * (e.g. jbd2 frozen metadata buffers).  This is the same data that
+        * the loop driver writes to its backing file — no exposure risk.
+        * The bvec length is always trusted, so the size check in
+        * check_copy_size() is not needed either.  Use the unchecked
+        * helpers to avoid false positives on slab pages.
+        */
        if (dir == ITER_DEST)
-               copied = copy_to_iter(bv_buf, len, uiter);
+               copied = _copy_to_iter(bv_buf, len, uiter);
        else
-               copied = copy_from_iter(bv_buf, len, uiter);
+               copied = _copy_from_iter(bv_buf, len, uiter);
 
        kunmap_local(bv_buf);
 
--

2.53.0

maintainer
#2 lore raw
In reply to Ming Lei
Quoted 38 lines · Ming Lei

Bio pages may originate from slab caches that lack a usercopy region (e.g. jbd2 frozen metadata buffers allocated via jbd2_alloc()). When CONFIG_HARDENED_USERCOPY is enabled, copy_to_iter() calls check_copy_size() which rejects these slab pages, triggering a kernel BUG in usercopy_abort().

This is a false positive: the data is ordinary block I/O content ? the same data the loop/nbd driver writes to its backing file via vfs_iter_write(). The bvec length is always trusted, so the size check in check_copy_size() is not needed either.

Switch to _copy_to_iter()/_copy_from_iter() which skip the check_copy_size() wrapper while the underlying copy_to_user() remains unchanged.

Fixes 2299ceec364e ("ublk: use copy_{to,from}_iter() for user copy")

---
V2:
- update commit log (Caleb Sander Mateos)

 drivers/block/ublk_drv.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/block/ublk_drv.c +6 -0
index 2e475bdc54dd..3e329906ae19 100644
@@ -1322,10 +1322,18 @@ static bool ublk_copy_user_bvec(const struct bio_vec *bv, unsigned *offset,
 
 	len = bv->bv_len - *offset;
 	bv_buf = kmap_local_page(bv->bv_page) + bv->bv_offset + *offset;
+	/*
+	 * Bio pages may originate from slab caches without a usercopy region
+	 * (e.g. jbd2 frozen metadata buffers).  This is the same data that
+	 * the loop driver writes to its backing file ? no exposure risk.
+	 * The bvec length is always trusted, so the size check in
+	 * check_copy_size() is not needed either.  Use the unchecked

drivers/block/ublk_drv.c static bool ublk_copy_user_bvec(const struct bio_vec *bv, unsigned *offset, · line 1338

Quoted 10 lines
drivers/block/ublk_drv.c +4 -2
+	 * helpers to avoid false positives on slab pages.
+	 */
 	if (dir == ITER_DEST)
-		copied = copy_to_iter(bv_buf, len, uiter);
+		copied = _copy_to_iter(bv_buf, len, uiter);
 	else
-		copied = copy_from_iter(bv_buf, len, uiter);
+		copied = _copy_from_iter(bv_buf, len, uiter);
 
 	kunmap_local(bv_buf);

Is this just a jbd2 issue? Because we can just get the slab marked appropriately to not trigger these warnings.

Signature · 1 line
Jens Axboe
author
#3 lore raw
Quoted 48 lines · Jens Axboe
Quoted 47 lines · Ming Lei

Bio pages may originate from slab caches that lack a usercopy region (e.g. jbd2 frozen metadata buffers allocated via jbd2_alloc()). When CONFIG_HARDENED_USERCOPY is enabled, copy_to_iter() calls check_copy_size() which rejects these slab pages, triggering a kernel BUG in usercopy_abort().

This is a false positive: the data is ordinary block I/O content ? the same data the loop/nbd driver writes to its backing file via vfs_iter_write(). The bvec length is always trusted, so the size check in check_copy_size() is not needed either.

Switch to _copy_to_iter()/_copy_from_iter() which skip the check_copy_size() wrapper while the underlying copy_to_user() remains unchanged.

Fixes 2299ceec364e ("ublk: use copy_{to,from}_iter() for user copy")

---
V2:
- update commit log (Caleb Sander Mateos)

 drivers/block/ublk_drv.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/block/ublk_drv.c +10 -2
index 2e475bdc54dd..3e329906ae19 100644
@@ -1322,10 +1322,18 @@ static bool ublk_copy_user_bvec(const struct bio_vec *bv, unsigned *offset,
 
 	len = bv->bv_len - *offset;
 	bv_buf = kmap_local_page(bv->bv_page) + bv->bv_offset + *offset;
+	/*
+	 * Bio pages may originate from slab caches without a usercopy region
+	 * (e.g. jbd2 frozen metadata buffers).  This is the same data that
+	 * the loop driver writes to its backing file ? no exposure risk.
+	 * The bvec length is always trusted, so the size check in
+	 * check_copy_size() is not needed either.  Use the unchecked
+	 * helpers to avoid false positives on slab pages.
+	 */
 	if (dir == ITER_DEST)
-		copied = copy_to_iter(bv_buf, len, uiter);
+		copied = _copy_to_iter(bv_buf, len, uiter);
 	else
-		copied = copy_from_iter(bv_buf, len, uiter);
+		copied = _copy_from_iter(bv_buf, len, uiter);
 
Quoted 4 lines

drivers/block/ublk_drv.c static bool ublk_copy_user_bvec(const struct bio_vec *bv, unsigned *offset, · line 1338

Quoted 1 line
drivers/block/ublk_drv.c +0 -0
 	kunmap_local(bv_buf);

Is this just a jbd2 issue? Because we can just get the slab marked appropriately to not trigger these warnings.

If the ublk block device is permitted to mount FS, it is inevitable to expose the meta to ublk userspace daemon, same with loop, or other block device.

Any bio pages backed by slab without a usercopy need to bypass the size check, which isn't necessary too.

thanks,
Ming