FAILED: patch "[PATCH] iomap: fix out-of-bounds bitmap_set() with zero-length range" failed to apply to 6.6-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 9c7d8f7c8994c790fca501dc45ce66e7356cbe05
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072923-divinely-glorifier-714d@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 9c7d8f7c8994c790fca501dc45ce66e7356cbe05 Mon Sep 17 00:00:00 2001
From: Zhang Yi <[email protected]>
Date: Tue, 14 Jul 2026 16:23:24 +0800
Subject: [PATCH] iomap: fix out-of-bounds bitmap_set() with zero-length range
ifs_set_range_dirty() and ifs_set_range_uptodate() compute last_blk as (off + len - 1) >> i_blkbits. When off is 0 and len is 0, the unsigned subtraction underflows to SIZE_MAX, producing a huge last_blk and nr_blks value that causes bitmap_set() to write far beyond the ifs->state allocation.
Regarding ifs_set_range_uptodate(), it is temporarily safe because len cannot be passed in as 0. However, for ifs_set_range_dirty() this is reachable from __iomap_write_end(): when copy_folio_from_iter_atomic() returns 0 (e.g. user buffer fault) and the folio is already uptodate, the guard at the top of __iomap_write_end() does not trigger because !folio_test_uptodate() is false, and iomap_set_range_dirty() is called with copied == 0.
Add a !len guard to both functions before the computation, so that a zero-length range is a no-op.
fs/iomap/buffered-io.c +14 -8
@@ -68,11 +68,13 @@ static bool ifs_set_range_uptodate(struct folio *folio, struct iomap_folio_state *ifs, size_t off, size_t len) { struct inode *inode = folio->mapping->host; -unsigned int first_blk = off >> inode->i_blkbits; -unsigned int last_blk = (off + len -1 ) >> inode->i_blkbits; -unsigned int nr_blks = last_blk - first_blk +1 ; +unsigned int first_blk, last_blk; -bitmap_set (ifs->state, first_blk, nr_blks); +if (len) { + first_blk = off >> inode->i_blkbits; + last_blk = (off + len -1 ) >> inode->i_blkbits; +bitmap_set (ifs->state, first_blk, last_blk - first_blk +1 ); + }return ifs_is_fully_uptodate (folio, ifs); }
@@ -204,13 +206,17 @@ static void ifs_set_range_dirty(struct folio *folio, {struct inode *inode = folio->mapping->host;unsigned int blks_per_folio =i_blocks_per_folio (inode, folio); -unsigned int first_blk = (off >> inode->i_blkbits); -unsigned int last_blk = (off + len -1 ) >> inode->i_blkbits; -unsigned int nr_blks = last_blk - first_blk +1 ; +unsigned int first_blk, last_blk;unsigned long flags; +if (!len) +return ; + + first_blk = off >> inode->i_blkbits; + last_blk = (off + len -1 ) >> inode->i_blkbits;spin_lock_irqsave (&ifs->state_lock, flags); -bitmap_set (ifs->state, first_blk + blks_per_folio, nr_blks); +bitmap_set (ifs->state, first_blk + blks_per_folio, + last_blk - first_blk +1 );spin_unlock_irqrestore (&ifs->state_lock, flags); }
Sasha Levin
maintainerPATCH 1/2 iomap: hold state_lock over call to ifs_set_range_uptodate()
From: "Matthew Wilcox (Oracle)" <[email protected]>
[ Upstream commit 279d5fc3227f04ef2c6125e5c440e7952173a89a ]
Patch series "Add folio_end_read", v2.
The core of this patchset is the new folio_end_read() call which filesystems can use when finishing a page cache read instead of separate calls to mark the folio uptodate and unlock it. As an illustration of its use, I converted ext4, iomap & mpage; more can be converted.
I think that's useful by itself, but the interesting optimisation is that we can implement that with a single XOR instruction that sets the uptodate bit, clears the lock bit, tests the waiter bit and provides a write memory barrier. That removes one memory barrier and one atomic instruction from each page read, which seems worth doing. That's in patch 15.
The last two patches could be a separate series, but basically we can do the same thing with the writeback flag that we do with the unlock flag; clear it and test the waiters bit at the same time.
This patch (of 17):
This is really preparation for the next patch, but it lets us call folio_mark_uptodate() in just one place instead of two.
Stable-dep-of: 9c7d8f7c8994 ("iomap: fix out-of-bounds bitmap_set() with zero-length range")
--- fs/iomap/buffered-io.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
fs/iomap/buffered-io.c +11 -9
@@ -57,30 +57,32 @@ static inline bool ifs_block_is_uptodate(struct iomap_folio_state *ifs,return test_bit (block, ifs->state); } -static void ifs_set_range_uptodate (struct folio *folio, +static bool ifs_set_range_uptodate (struct folio *folio,struct iomap_folio_state *ifs,size_t off,size_t len) {struct inode *inode = folio->mapping->host;unsigned int first_blk = off >> inode->i_blkbits;unsigned int last_blk = (off + len -1 ) >> inode->i_blkbits;unsigned int nr_blks = last_blk - first_blk +1 ; -unsigned long flags; -spin_lock_irqsave (&ifs->state_lock, flags);bitmap_set (ifs->state, first_blk, nr_blks); -if (ifs_is_fully_uptodate (folio, ifs)) -folio_mark_uptodate (folio); -spin_unlock_irqrestore (&ifs->state_lock, flags); +return ifs_is_fully_uptodate (folio, ifs); }static void iomap_set_range_uptodate (struct folio *folio,size_t off,size_t len) {struct iomap_folio_state *ifs = folio->private; +unsigned long flags; +bool uptodate = true; -if (ifs) -ifs_set_range_uptodate (folio, ifs, off, len); -else +if (ifs) { +spin_lock_irqsave (&ifs->state_lock, flags); + uptodate =ifs_set_range_uptodate (folio, ifs, off, len); +spin_unlock_irqrestore (&ifs->state_lock, flags); + } + +if (uptodate)folio_mark_uptodate (folio); }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 iomap: fix out-of-bounds bitmap_set() with zero-length range
From: Zhang Yi <[email protected]>
[ Upstream commit 9c7d8f7c8994c790fca501dc45ce66e7356cbe05 ]
ifs_set_range_dirty() and ifs_set_range_uptodate() compute last_blk as (off + len - 1) >> i_blkbits. When off is 0 and len is 0, the unsigned subtraction underflows to SIZE_MAX, producing a huge last_blk and nr_blks value that causes bitmap_set() to write far beyond the ifs->state allocation.
Regarding ifs_set_range_uptodate(), it is temporarily safe because len cannot be passed in as 0. However, for ifs_set_range_dirty() this is reachable from __iomap_write_end(): when copy_folio_from_iter_atomic() returns 0 (e.g. user buffer fault) and the folio is already uptodate, the guard at the top of __iomap_write_end() does not trigger because !folio_test_uptodate() is false, and iomap_set_range_dirty() is called with copied == 0.
Add a !len guard to both functions before the computation, so that a zero-length range is a no-op.
--- fs/iomap/buffered-io.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
fs/iomap/buffered-io.c +14 -8
@@ -61,11 +61,13 @@ static bool ifs_set_range_uptodate(struct folio *folio, struct iomap_folio_state *ifs, size_t off, size_t len) { struct inode *inode = folio->mapping->host; -unsigned int first_blk = off >> inode->i_blkbits; -unsigned int last_blk = (off + len -1 ) >> inode->i_blkbits; -unsigned int nr_blks = last_blk - first_blk +1 ; +unsigned int first_blk, last_blk; -bitmap_set (ifs->state, first_blk, nr_blks); +if (len) { + first_blk = off >> inode->i_blkbits; + last_blk = (off + len -1 ) >> inode->i_blkbits; +bitmap_set (ifs->state, first_blk, last_blk - first_blk +1 ); + }return ifs_is_fully_uptodate (folio, ifs); }
@@ -127,13 +129,17 @@ static void ifs_set_range_dirty(struct folio *folio, {struct inode *inode = folio->mapping->host;unsigned int blks_per_folio =i_blocks_per_folio (inode, folio); -unsigned int first_blk = (off >> inode->i_blkbits); -unsigned int last_blk = (off + len -1 ) >> inode->i_blkbits; -unsigned int nr_blks = last_blk - first_blk +1 ; +unsigned int first_blk, last_blk;unsigned long flags; +if (!len) +return ; + + first_blk = off >> inode->i_blkbits; + last_blk = (off + len -1 ) >> inode->i_blkbits;spin_lock_irqsave (&ifs->state_lock, flags); -bitmap_set (ifs->state, first_blk + blks_per_folio, nr_blks); +bitmap_set (ifs->state, first_blk + blks_per_folio, + last_blk - first_blk +1 );spin_unlock_irqrestore (&ifs->state_lock, flags); }
Signature · 1 line
2.53.0