| From 353b9d7a68291251e3ba0c6b58325b795b45cea6 Mon Sep 17 00:00:00 2001 |
| From: Eric Biggers <ebiggers@google.com> |
| Date: Tue, 11 Aug 2020 18:35:36 -0700 |
| Subject: [PATCH] fs/minix: fix block limit check for V1 filesystems |
| |
| commit 0a12c4a8069607247cb8edc3b035a664e636fd9a upstream. |
| |
| The minix filesystem reads its maximum file size from its on-disk |
| superblock. This value isn't necessarily a multiple of the block size. |
| When it's not, the V1 block mapping code doesn't allow mapping the last |
| possible block. Commit 6ed6a722f9ab ("minixfs: fix block limit check") |
| fixed this in the V2 mapping code. Fix it in the V1 mapping code too. |
| |
| Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") |
| Signed-off-by: Eric Biggers <ebiggers@google.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Cc: Alexander Viro <viro@zeniv.linux.org.uk> |
| Cc: Qiujun Huang <anenbupt@gmail.com> |
| Link: http://lkml.kernel.org/r/20200628060846.682158-6-ebiggers@kernel.org |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/minix/itree_v1.c b/fs/minix/itree_v1.c |
| index c0d418209ead..405573a79aab 100644 |
| --- a/fs/minix/itree_v1.c |
| +++ b/fs/minix/itree_v1.c |
| @@ -29,7 +29,7 @@ static int block_to_path(struct inode * inode, long block, int offsets[DEPTH]) |
| if (block < 0) { |
| printk("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n", |
| block, inode->i_sb->s_bdev); |
| - } else if (block >= inode->i_sb->s_maxbytes/BLOCK_SIZE) { |
| + } else if ((u64)block * BLOCK_SIZE >= inode->i_sb->s_maxbytes) { |
| if (printk_ratelimit()) |
| printk("MINIX-fs: block_to_path: " |
| "block %ld too big on dev %pg\n", |
| -- |
| 2.27.0 |
| |
