Skip to contentSkip to conversation

ext4: Detect already used quota file early

PATCH Applied Jan Kara 3 participants 4 messages Oct 13, 2020 – Oct 15, 2020 ext4 file system

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore

Jan Kara

author reviewer
#0 lore raw

PATCH 1/1 ext4: Detect already used quota file early

When we try to use file already used as a quota file again (for the same or different quota type), strange things can happen. At the very least lockdep annotations may be wrong but also inode flags may be wrongly set / reset. When the file is used for two quota types at once we can even corrupt the file and likely crash the kernel. Catch all these cases by checking whether passed file is already used as quota file and bail early in that case.

This fixes occasional generic/219 failure due to lockdep complaint.

---
 fs/ext4/super.c | 5 +++++
 1 file changed, 5 insertions(+)
fs/ext4/super.c +5 -0
index ea425b49b345..49b2e6be35c4 100644
@@ -6042,6 +6042,11 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
 	/* Quotafile not on the same filesystem? */
 	if (path->dentry->d_sb != sb)
 		return -EXDEV;
+
+	/* Quota already enabled for this file? */
+	if (path->dentry->d_inode->i_flags & S_NOQUOTA)
+		return -EBUSY;
+
 	/* Journaling quota? */
 	if (EXT4_SB(sb)->s_qf_names[type]) {
 		/* Quotafile not in fs root? */
Signature · 1 line
2.16.4
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Jan Kara

When we try to use file already used as a quota file again (for the same or different quota type), strange things can happen. At the very least lockdep annotations may be wrong but also inode flags may be wrongly set / reset. When the file is used for two quota types at once we can even corrupt the file and likely crash the kernel. Catch all these cases by checking whether passed file is already used as quota file and bail early in that case.

Quoted 4 lines

This fixes occasional generic/219 failure due to lockdep complaint.

Patch looks OK, but a minor question/suggestion below...

fs/ext4/super.c static int ext4_quota_on(struct super_block *sb, int type, int format_id, · line 6048

Quoted 12 lines
fs/ext4/super.c +4 -0
index ea425b49b345..49b2e6be35c4 100644
@@ -6042,6 +6042,11 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
 	/* Quotafile not on the same filesystem? */
 	if (path->dentry->d_sb != sb)
 		return -EXDEV;
+
+	/* Quota already enabled for this file? */
+	if (path->dentry->d_inode->i_flags & S_NOQUOTA)
+		return -EBUSY;

Any reason not to use IS_NOQUOTA(path->dentry->d_inode) here? I was trying to see where S_NOQUOTA is set, and it seems that all of the quota code is using IS_NOQUOTA().

Cheers, Andreas

author reviewer
#2 lore raw
Quoted 19 lines · Andreas Dilger
Quoted 9 lines · Jan Kara

When we try to use file already used as a quota file again (for the same or different quota type), strange things can happen. At the very least lockdep annotations may be wrong but also inode flags may be wrongly set / reset. When the file is used for two quota types at once we can even corrupt the file and likely crash the kernel. Catch all these cases by checking whether passed file is already used as quota file and bail early in that case.

Quoted 4 lines

This fixes occasional generic/219 failure due to lockdep complaint.

Patch looks OK, but a minor question/suggestion below...

Quoted 16 lines

fs/ext4/super.c static int ext4_quota_on(struct super_block *sb, int type, int format_id, · line 6048

Quoted 12 lines
fs/ext4/super.c +4 -0
index ea425b49b345..49b2e6be35c4 100644
@@ -6042,6 +6042,11 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
 	/* Quotafile not on the same filesystem? */
 	if (path->dentry->d_sb != sb)
 		return -EXDEV;
+
+	/* Quota already enabled for this file? */
+	if (path->dentry->d_inode->i_flags & S_NOQUOTA)
+		return -EBUSY;

Any reason not to use IS_NOQUOTA(path->dentry->d_inode) here? I was trying to see where S_NOQUOTA is set, and it seems that all of the quota code is using IS_NOQUOTA().

OK, right. I'll change that. Thanks for review.

Honza

Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR
maintainer Applied
#3 lore raw
In reply to Jan Kara
Quoted 8 lines · Jan Kara

When we try to use file already used as a quota file again (for the same or different quota type), strange things can happen. At the very least lockdep annotations may be wrong but also inode flags may be wrongly set / reset. When the file is used for two quota types at once we can even corrupt the file and likely crash the kernel. Catch all these cases by checking whether passed file is already used as quota file and bail early in that case.

Quoted 4 lines

This fixes occasional generic/219 failure due to lockdep complaint.

Thanks, applied.

- Ted