mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 01:49:46 +00:00
nilfs2: fix possible int overflows in nilfs_fiemap()
commit6438ef381cupstream. Since nilfs_bmap_lookup_contig() in nilfs_fiemap() calculates its result by being prepared to go through potentially maxblocks == INT_MAX blocks, the value in n may experience an overflow caused by left shift of blkbits. While it is extremely unlikely to occur, play it safe and cast right hand expression to wider type to mitigate the issue. Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE. Link: https://lkml.kernel.org/r/20250124222133.5323-1-konishi.ryusuke@gmail.com Fixes:622daaff0a("nilfs2: fiemap support") Signed-off-by: Nikita Zhandarovich <n.zhandarovich@fintech.ru> Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
b6833b3898
commit
f2bd0f1ab4
@@ -1267,7 +1267,7 @@ int nilfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
|
||||
if (size) {
|
||||
if (phys && blkphy << blkbits == phys + size) {
|
||||
/* The current extent goes on */
|
||||
size += n << blkbits;
|
||||
size += (u64)n << blkbits;
|
||||
} else {
|
||||
/* Terminate the current extent */
|
||||
ret = fiemap_fill_next_extent(
|
||||
@@ -1280,14 +1280,14 @@ int nilfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
|
||||
flags = FIEMAP_EXTENT_MERGED;
|
||||
logical = blkoff << blkbits;
|
||||
phys = blkphy << blkbits;
|
||||
size = n << blkbits;
|
||||
size = (u64)n << blkbits;
|
||||
}
|
||||
} else {
|
||||
/* Start a new extent */
|
||||
flags = FIEMAP_EXTENT_MERGED;
|
||||
logical = blkoff << blkbits;
|
||||
phys = blkphy << blkbits;
|
||||
size = n << blkbits;
|
||||
size = (u64)n << blkbits;
|
||||
}
|
||||
blkoff += n;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user