From: Jan Kara <jack@suse.cz>
Date: Fri, 20 Oct 2023 11:23:51 +0000 (+0200)
Subject: quota: Remove BUG_ON in dquot_load_quota_sb()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d44c576637238d2dafdd22dc856f0cb2a1553049;p=linux.git

quota: Remove BUG_ON in dquot_load_quota_sb()

The case when someone passes DQUOT_SUSPENDED flag to
dquot_load_quota_sb() is easy to handle. So just WARN_ON_ONCE and bail
with error if that happens instead of calling BUG_ON which is likely to
lockup the machine.

Signed-off-by: Jan Kara <jack@suse.cz>
---

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index d863d6b1ff97d..85edbbafaaa42 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -2385,7 +2385,8 @@ int dquot_load_quota_sb(struct super_block *sb, int type, int format_id,
 	lockdep_assert_held_write(&sb->s_umount);
 
 	/* Just unsuspend quotas? */
-	BUG_ON(flags & DQUOT_SUSPENDED);
+	if (WARN_ON_ONCE(flags & DQUOT_SUSPENDED))
+		return -EINVAL;
 
 	if (!fmt)
 		return -ESRCH;