summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPan Bian <bianpan2016@163.com>2018-12-04 05:28:02 +0100
committerTheodore Ts'o <tytso@mit.edu>2018-12-04 05:28:02 +0100
commit61157b24e60fb3cd1f85f2c76a7b1d628f970144 (patch)
tree0e6fc271e232be09fe8b384561de9010453953b4
parentjbd2: avoid long hold times of j_state_lock while committing a transaction (diff)
downloadlinux-61157b24e60fb3cd1f85f2c76a7b1d628f970144.tar.xz
linux-61157b24e60fb3cd1f85f2c76a7b1d628f970144.zip
ext4: fix possible use after free in ext4_quota_enable
The function frees qf_inode via iput but then pass qf_inode to lockdep_set_quota_inode on the failure path. This may result in a use-after-free bug. The patch frees df_inode only when it is never used. Fixes: daf647d2dd5 ("ext4: add lockdep annotations for i_data_sem") Cc: stable@kernel.org # 4.6 Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Pan Bian <bianpan2016@163.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r--fs/ext4/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 361624460431..d22e761aaa18 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5713,9 +5713,9 @@ static int ext4_quota_enable(struct super_block *sb, int type, int format_id,
qf_inode->i_flags |= S_NOQUOTA;
lockdep_set_quota_inode(qf_inode, I_DATA_SEM_QUOTA);
err = dquot_enable(qf_inode, type, format_id, flags);
- iput(qf_inode);
if (err)
lockdep_set_quota_inode(qf_inode, I_DATA_SEM_NORMAL);
+ iput(qf_inode);
return err;
}