Skip to contentSkip to conversation

NILFS2 superroot inode-size OOB read

PATCH In review David Lee 2 participants 2 messages Jul 17 NILFS2 filesystem

lore
Share & tools
lore

David Lee

author
#0 lore raw

PATCH 1/1 NILFS2 superroot inode-size OOB read

super-root inode metadata size is trusted before nilfs_read_inode_common().

Reject super-root inode sizes whose computed on-disk footprint exceeds the filesystem block size. This prevents malformed filesystem images from making nilfs_read_inode_common() read past the end of the super-root block.

Fixes 8a9d2191e9f4 ("nilfs2: operations for the_nilfs core object")
Assisted-by Codex:gpt-5.5

---
Trail of Bits has a reproducer that triggers kernel panic demonstrating this bug and can be shared if needed.

fs/nilfs2/the_nilfs.c | 6 ++++++

 1 file changed, 6 insertions(+)
fs/nilfs2/the_nilfs.c +6 -0
index 7b23e373a106..f3805e7aabeb 100644
@@ -461,6 +461,12 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs,
 			  nilfs->ns_inode_size);
 		return -EINVAL;
 	}
+	if (NILFS_SR_BYTES(nilfs->ns_inode_size) > nilfs->ns_blocksize) {
+		nilfs_err(nilfs->ns_sb,
+			  "too large inode size for super root: %d bytes",
+			  nilfs->ns_inode_size);
+		return -EINVAL;
+	}
 
 	nilfs->ns_first_ino = le32_to_cpu(sbp->s_first_ino);
 	if (nilfs->ns_first_ino < NILFS_USER_INO) {
maintainer
#1 lore raw
Quoted 7 lines · David Lee

super-root inode metadata size is trusted before nilfs_read_inode_common().

Reject super-root inode sizes whose computed on-disk footprint exceeds the filesystem block size. This prevents malformed filesystem images from making nilfs_read_inode_common() read past the end of the super-root block.

Quoted 6 lines
Fixes 8a9d2191e9f4 ("nilfs2: operations for the_nilfs core object")
Assisted-by Codex:gpt-5.5

---
Trail of Bits has a reproducer that triggers kernel panic demonstrating this bug and can be shared if needed.

Thanks for the patch, David Lee.

This patch is certainly necessary, and the checking method and location are appropriate.

However, regarding the patch title, I would like to modify it to something like "nilfs2: fix potential super root inode-size OOB read" to clarify its purpose.

I can make this change when submitting it upstream, or you are welcome to resubmit it yourself.

Thanks,
Ryusuke Konishi

Quoted 20 lines

fs/nilfs2/the_nilfs.c | 6 ++++++

 1 file changed, 6 insertions(+)
fs/nilfs2/the_nilfs.c +6 -0
index 7b23e373a106..f3805e7aabeb 100644
@@ -461,6 +461,12 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs,
                          nilfs->ns_inode_size);
                return -EINVAL;
        }
+       if (NILFS_SR_BYTES(nilfs->ns_inode_size) > nilfs->ns_blocksize) {
+               nilfs_err(nilfs->ns_sb,
+                         "too large inode size for super root: %d bytes",
+                         nilfs->ns_inode_size);
+               return -EINVAL;
+       }
 
        nilfs->ns_first_ino = le32_to_cpu(sbp->s_first_ino);
        if (nilfs->ns_first_ino < NILFS_USER_INO) {