Skip to contentSkip to conversation

fs-minix-fix-block-limit-check-for-v1-filesystems.patch removed from -mm tree

merged [email protected] 1 participant 1 message Aug 12, 2020

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: fs/minix: fix block limit check for V1 filesystems
has been removed from the -mm tree. Its filename was
fs-minix-fix-block-limit-check-for-v1-filesystems.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Eric Biggers <[email protected]>
Subject: fs/minix: fix block limit check for V1 filesystems

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")
Cc Alexander Viro <[email protected]>
Cc Qiujun Huang <[email protected]>

---

 fs/minix/itree_v1.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/minix/itree_v1.c renamed from fs/minix/itree_v1.c~fs-minix-fix-block-limit-check-for-v1-filesystems +1 -1
@@ -29,7 +29,7 @@ static int block_to_path(struct inode *
 	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",

_

Patches currently in -mm which might be from [email protected] are