diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2019-11-11 22:18:13 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-04 13:34:36 +0100 |
| commit | 0a5a9d02428d4e8c181413a51f7bcf0d7080dbf3 (patch) | |
| tree | 98157b9bb80a34ff021c0b7b3dfb32110b775f60 /fs | |
| parent | f8de68e22e16bc503b573a2d1c81a322346c0b5b (diff) | |
| download | linux-stable-0a5a9d02428d4e8c181413a51f7bcf0d7080dbf3.tar.gz linux-stable-0a5a9d02428d4e8c181413a51f7bcf0d7080dbf3.tar.bz2 linux-stable-0a5a9d02428d4e8c181413a51f7bcf0d7080dbf3.zip | |
ext4: work around deleting a file with i_nlink == 0 safely
[ Upstream commit c7df4a1ecb8579838ec8c56b2bb6a6716e974f37 ]
If the file system is corrupted such that a file's i_links_count is
too small, then it's possible that when unlinking that file, i_nlink
will already be zero. Previously we were working around this kind of
corruption by forcing i_nlink to one; but we were doing this before
trying to delete the directory entry --- and if the file system is
corrupted enough that ext4_delete_entry() fails, then we exit with
i_nlink elevated, and this causes the orphan inode list handling to be
FUBAR'ed, such that when we unmount the file system, the orphan inode
list can get corrupted.
A better way to fix this is to simply skip trying to call drop_nlink()
if i_nlink is already zero, thus moving the check to the place where
it makes the most sense.
https://bugzilla.kernel.org/show_bug.cgi?id=205433
Link: https://lore.kernel.org/r/20191112032903.8828-1-tytso@mit.edu
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/namei.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index aa08e129149d..712bf332e394 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -3040,18 +3040,17 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry) if (IS_DIRSYNC(dir)) ext4_handle_sync(handle); - if (inode->i_nlink == 0) { - ext4_warning_inode(inode, "Deleting file '%.*s' with no links", - dentry->d_name.len, dentry->d_name.name); - set_nlink(inode, 1); - } retval = ext4_delete_entry(handle, dir, de, bh); if (retval) goto end_unlink; dir->i_ctime = dir->i_mtime = ext4_current_time(dir); ext4_update_dx_flag(dir); ext4_mark_inode_dirty(handle, dir); - drop_nlink(inode); + if (inode->i_nlink == 0) + ext4_warning_inode(inode, "Deleting file '%.*s' with no links", + dentry->d_name.len, dentry->d_name.name); + else + drop_nlink(inode); if (!inode->i_nlink) ext4_orphan_add(handle, inode); inode->i_ctime = ext4_current_time(inode); |