Skip to content

Commit b11e8fb

Browse files
konisgregkh
authored andcommitted
nilfs2: add missing check for inode numbers on directory entries
commit bb76c6c upstream. Syzbot reported that mounting and unmounting a specific pattern of corrupted nilfs2 filesystem images causes a use-after-free of metadata file inodes, which triggers a kernel bug in lru_add_fn(). As Jan Kara pointed out, this is because the link count of a metadata file gets corrupted to 0, and nilfs_evict_inode(), which is called from iput(), tries to delete that inode (ifile inode in this case). The inconsistency occurs because directories containing the inode numbers of these metadata files that should not be visible in the namespace are read without checking. Fix this issue by treating the inode numbers of these internal files as errors in the sanity check helper when reading directory folios/pages. Also thanks to Hillf Danton and Matthew Wilcox for their initial mm-layer analysis. Link: https://lkml.kernel.org/r/20240623051135.4180-3-konishi.ryusuke@gmail.com Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Reported-by: syzbot+d79afb004be235636ee8@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=d79afb004be235636ee8 Reported-by: Jan Kara <jack@suse.cz> Closes: https://lkml.kernel.org/r/20240617075758.wewhukbrjod5fp5o@quack3 Tested-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Cc: Hillf Danton <hdanton@sina.com> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3be4dcc commit b11e8fb

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

fs/nilfs2/dir.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ static bool nilfs_check_page(struct page *page)
143143
goto Enamelen;
144144
if (((offs + rec_len - 1) ^ offs) & ~(chunk_size-1))
145145
goto Espan;
146+
if (unlikely(p->inode &&
147+
NILFS_PRIVATE_INODE(le64_to_cpu(p->inode))))
148+
goto Einumber;
146149
}
147150
if (offs != limit)
148151
goto Eend;
@@ -168,6 +171,9 @@ static bool nilfs_check_page(struct page *page)
168171
goto bad_entry;
169172
Espan:
170173
error = "directory entry across blocks";
174+
goto bad_entry;
175+
Einumber:
176+
error = "disallowed inode number";
171177
bad_entry:
172178
nilfs_error(sb,
173179
"bad entry in directory #%lu: %s - offset=%lu, inode=%lu, rec_len=%d, name_len=%d",

fs/nilfs2/nilfs.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ enum {
121121
((ino) >= NILFS_FIRST_INO(sb) || \
122122
((ino) < NILFS_USER_INO && (NILFS_SYS_INO_BITS & BIT(ino))))
123123

124+
#define NILFS_PRIVATE_INODE(ino) ({ \
125+
ino_t __ino = (ino); \
126+
((__ino) < NILFS_USER_INO && (__ino) != NILFS_ROOT_INO && \
127+
(__ino) != NILFS_SKETCH_INO); })
128+
124129
/**
125130
* struct nilfs_transaction_info: context information for synchronization
126131
* @ti_magic: Magic number

0 commit comments

Comments
 (0)