Skip to content

Commit 49ae997

Browse files
konisakpm00
authored andcommitted
nilfs2: add missing check for inode numbers on directory entries
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/[email protected] Signed-off-by: Ryusuke Konishi <[email protected]> Reported-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=d79afb004be235636ee8 Reported-by: Jan Kara <[email protected]> Closes: https://lkml.kernel.org/r/20240617075758.wewhukbrjod5fp5o@quack3 Tested-by: Ryusuke Konishi <[email protected]> Cc: Hillf Danton <[email protected]> Cc: Matthew Wilcox (Oracle) <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 1ab8425 commit 49ae997

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
@@ -135,6 +135,9 @@ static bool nilfs_check_folio(struct folio *folio, char *kaddr)
135135
goto Enamelen;
136136
if (((offs + rec_len - 1) ^ offs) & ~(chunk_size-1))
137137
goto Espan;
138+
if (unlikely(p->inode &&
139+
NILFS_PRIVATE_INODE(le64_to_cpu(p->inode))))
140+
goto Einumber;
138141
}
139142
if (offs != limit)
140143
goto Eend;
@@ -160,6 +163,9 @@ static bool nilfs_check_folio(struct folio *folio, char *kaddr)
160163
goto bad_entry;
161164
Espan:
162165
error = "directory entry across blocks";
166+
goto bad_entry;
167+
Einumber:
168+
error = "disallowed inode number";
163169
bad_entry:
164170
nilfs_error(sb,
165171
"bad entry in directory #%lu: %s - offset=%lu, inode=%lu, rec_len=%zd, 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)