From b7b26945d1e4491934111d65ac49091daefbdda8 Mon Sep 17 00:00:00 2001 From: Nate Clark Date: Wed, 4 Jan 2017 12:31:37 -0500 Subject: disk-utils/mkfs.minix: Set ninodes after checking max ninodes in the superblock needs to be set after inodes is checked against MINIX_MAX_INODES otherwise a value larger than MINIX_MAX_INODES can be attempted to be stored in the superblock. Without this change the command "mkfs.minix -2 -i 65530 " would write a minix superblock with ninodes set to 0. Signed-off-by: Nate Clark --- disk-utils/mkfs.minix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'disk-utils/mkfs.minix.c') diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c index 613a06997..47a155c55 100644 --- a/disk-utils/mkfs.minix.c +++ b/disk-utils/mkfs.minix.c @@ -534,9 +534,9 @@ static void setup_tables(const struct fs_control *ctl) { if (fs_version == 3) Super3.s_ninodes = inodes; else { - Super.s_ninodes = inodes; if (inodes > MINIX_MAX_INODES) inodes = MINIX_MAX_INODES; + Super.s_ninodes = inodes; } super_set_map_blocks(ctl, inodes); if (MINIX_MAX_INODES < first_zone_data()) -- cgit v1.2.3-55-g7522