raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

exfat: fix i_blocks for files truncated over 4 GiB

Browse Source 
[ Upstream commit 92fba084b7 ]

In exfat_truncate(), the computation of inode->i_blocks is wrong if
the file is larger than 4 GiB because a 32-bit variable is used as a
mask. This is fixed and simplified by using round_up().

Also fix the same buggy computation in exfat_read_root() and another
(correct) one in exfat_fill_inode(). The latter was fixed another way
last month but can be simplified by using round_up() as well. See:

  commit 0c336d6e33 ("exfat: fix incorrect loading of i_blocks for
                        large files")

Fixes: 98d917047e ("exfat: add file operations")
Cc: stable@vger.kernel.org # v5.7+
Suggested-by: Matthew Wilcox <willy@infradead.org>
Reviewed-by: Sungjong Seo <sj1557.seo@samsung.com>
Signed-off-by: Christophe Vu-Brugier <christophe.vu-brugier@seagate.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe Vu-Brugier
2021-11-22 22:02:37 +09:00
committed by Greg Kroah-Hartman
parent 1b810d5cb6
commit db36a94ed6
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/exfat/file.c
View File

@@ -250,8 +250,8 @@ void exfat_truncate(struct inode *inode, loff_t size)
else else
mark_inode_dirty(inode); mark_inode_dirty(inode);
inode->i_blocks = ((i_size_read(inode) + (sbi->cluster_size - 1)) & inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >>
~(sbi->cluster_size - 1)) >> inode->i_blkbits; inode->i_blkbits;
write_size: write_size:
aligned_size = i_size_read(inode); aligned_size = i_size_read(inode);
if (aligned_size & (blocksize - 1)) { if (aligned_size & (blocksize - 1)) {

4
fs/exfat/inode.c
View File

@@ -600,8 +600,8 @@ static int exfat_fill_inode(struct inode *inode, struct exfat_dir_entry *info)
exfat_save_attr(inode, info->attr); exfat_save_attr(inode, info->attr);
inode->i_blocks = ((i_size_read(inode) + (sbi->cluster_size - 1)) & inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >>
~((loff_t)sbi->cluster_size - 1)) >> inode->i_blkbits; inode->i_blkbits;
inode->i_mtime = info->mtime; inode->i_mtime = info->mtime;
inode->i_ctime = info->mtime; inode->i_ctime = info->mtime;
ei->i_crtime = info->crtime; ei->i_crtime = info->crtime;

4
fs/exfat/super.c
View File

@@ -364,8 +364,8 @@ static int exfat_read_root(struct inode *inode)
inode->i_op = &exfat_dir_inode_operations; inode->i_op = &exfat_dir_inode_operations;
inode->i_fop = &exfat_dir_operations; inode->i_fop = &exfat_dir_operations;
inode->i_blocks = ((i_size_read(inode) + (sbi->cluster_size - 1)) inode->i_blocks = round_up(i_size_read(inode), sbi->cluster_size) >>
& ~(sbi->cluster_size - 1)) >> inode->i_blkbits; inode->i_blkbits;
ei->i_pos = ((loff_t)sbi->root_dir << 32) | 0xffffffff; ei->i_pos = ((loff_t)sbi->root_dir << 32) | 0xffffffff;
ei->i_size_aligned = i_size_read(inode); ei->i_size_aligned = i_size_read(inode);
ei->i_size_ondisk = i_size_read(inode); ei->i_size_ondisk = i_size_read(inode);