diff options
author | Theodore Ts'o <tytso@mit.edu> | 2017-12-10 23:44:11 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2017-12-10 23:44:11 -0500 |
commit | 996fc4477a0ea28226b30d175f053fb6f9a4fa36 (patch) | |
tree | 7c3c421850f99a68331c6a5a0b292b38650cfb29 /fs/ext4 | |
parent | c894aa97577e47d3066b27b32499ecf899bfa8b0 (diff) | |
download | linux-stable-996fc4477a0ea28226b30d175f053fb6f9a4fa36.tar.gz linux-stable-996fc4477a0ea28226b30d175f053fb6f9a4fa36.tar.bz2 linux-stable-996fc4477a0ea28226b30d175f053fb6f9a4fa36.zip |
ext4: add missing error check in __ext4_new_inode()
It's possible for ext4_get_acl() to return an ERR_PTR. So we need to
add a check for this case in __ext4_new_inode(). Otherwise on an
error we can end up oops the kernel.
This was getting triggered by xfstests generic/388, which is a test
which exercises the shutdown code path.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/ext4')
-rw-r--r-- | fs/ext4/ialloc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index b4267d72f249..b32cf263750d 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -816,6 +816,8 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir, #ifdef CONFIG_EXT4_FS_POSIX_ACL struct posix_acl *p = get_acl(dir, ACL_TYPE_DEFAULT); + if (IS_ERR(p)) + return ERR_CAST(p); if (p) { int acl_size = p->a_count * sizeof(ext4_acl_entry); |