diff options
| author | Amir Goldstein <amir73il@gmail.com> | 2011-05-16 09:59:13 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2011-05-16 09:59:13 -0400 |
| commit | 0b26859027ce0005ef89520af20351360e51ad76 (patch) | |
| tree | d0d8cec8c1f413c0980b4a66614871bd435ab334 /fs/ext4 | |
| parent | 6976a6f2acde2b0443cd64f1d08af90630e4ce81 (diff) | |
| download | lwn-0b26859027ce0005ef89520af20351360e51ad76.tar.gz lwn-0b26859027ce0005ef89520af20351360e51ad76.zip | |
ext4: fix oops in ext4_quota_off()
If quota is not enabled when ext4_quota_off() is called, we must not
dereference quota file inode since it is NULL. Check properly for
this.
This fixes a bug in commit 21f976975cbe (ext4: remove unnecessary
[cm]time update of quota file), which was merged for 2.6.39-rc3.
Reported-by: Amir Goldstein <amir73il@users.sf.net>
Signed-off-by: Amir Goldstein <amir73il@users.sf.net>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/super.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index fc827bb2a69b..268935118251 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4681,6 +4681,9 @@ static int ext4_quota_off(struct super_block *sb, int type) if (test_opt(sb, DELALLOC)) sync_filesystem(sb); + if (!inode) + goto out; + /* Update modification times of quota files when userspace can * start looking at them */ handle = ext4_journal_start(inode, 1); |