diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2014-10-05 22:56:00 -0400 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-05 11:43:05 +0000 |
| commit | ba55c5e8a376e820a07bb026993b2c8f6de9691f (patch) | |
| tree | bcd9f50952d7ebf6d62dd4e818b557592b5e8dd3 /fs/ext4 | |
| parent | e1956e85e59ef074d954ca4ba2771a0935527ebb (diff) | |
| download | linux-stable-ba55c5e8a376e820a07bb026993b2c8f6de9691f.tar.gz linux-stable-ba55c5e8a376e820a07bb026993b2c8f6de9691f.tar.bz2 linux-stable-ba55c5e8a376e820a07bb026993b2c8f6de9691f.zip | |
ext4: add ext4_iget_normal() which is to be used for dir tree lookups
commit f4bb2981024fc91b23b4d09a8817c415396dbabb upstream.
If there is a corrupted file system which has directory entries that
point at reserved, metadata inodes, prohibit them from being used by
treating them the same way we treat Boot Loader inodes --- that is,
mark them to be bad inodes. This prohibits them from being opened,
deleted, or modified via chmod, chown, utimes, etc.
In particular, this prevents a corrupted file system which has a
directory entry which points at the journal inode from being deleted
and its blocks released, after which point Much Hilarity Ensues.
Reported-by: Sami Liedes <sami.liedes@iki.fi>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/ext4.h | 1 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 7 | ||||
| -rw-r--r-- | fs/ext4/namei.c | 4 | ||||
| -rw-r--r-- | fs/ext4/super.c | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index b6874405f0dc..2f4eb9f9d634 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2108,6 +2108,7 @@ int do_journal_get_write_access(handle_t *handle, #define CONVERT_INLINE_DATA 2 extern struct inode *ext4_iget(struct super_block *, unsigned long); +extern struct inode *ext4_iget_normal(struct super_block *, unsigned long); extern int ext4_write_inode(struct inode *, struct writeback_control *); extern int ext4_setattr(struct dentry *, struct iattr *); extern int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry, diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index eee357d03a87..2b06bac72c94 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4244,6 +4244,13 @@ bad_inode: return ERR_PTR(ret); } +struct inode *ext4_iget_normal(struct super_block *sb, unsigned long ino) +{ + if (ino < EXT4_FIRST_INO(sb) && ino != EXT4_ROOT_INO) + return ERR_PTR(-EIO); + return ext4_iget(sb, ino); +} + static int ext4_inode_blocks_set(handle_t *handle, struct ext4_inode *raw_inode, struct ext4_inode_info *ei) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 1cafd5d98a9b..8a48fcb9a91a 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1441,7 +1441,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi dentry); return ERR_PTR(-EIO); } - inode = ext4_iget(dir->i_sb, ino); + inode = ext4_iget_normal(dir->i_sb, ino); if (inode == ERR_PTR(-ESTALE)) { EXT4_ERROR_INODE(dir, "deleted inode referenced: %u", @@ -1474,7 +1474,7 @@ struct dentry *ext4_get_parent(struct dentry *child) return ERR_PTR(-EIO); } - return d_obtain_alias(ext4_iget(child->d_inode->i_sb, ino)); + return d_obtain_alias(ext4_iget_normal(child->d_inode->i_sb, ino)); } /* diff --git a/fs/ext4/super.c b/fs/ext4/super.c index b0761012ef7e..90720fe38d5a 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1002,7 +1002,7 @@ static struct inode *ext4_nfs_get_inode(struct super_block *sb, * Currently we don't know the generation for parent directory, so * a generation of 0 means "accept any" */ - inode = ext4_iget(sb, ino); + inode = ext4_iget_normal(sb, ino); if (IS_ERR(inode)) return ERR_CAST(inode); if (generation && inode->i_generation != generation) { |