From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC6F3C2D0A3 for ; Tue, 3 Nov 2020 20:55:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 78B56223BD for ; Tue, 3 Nov 2020 20:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436952; bh=nYkXlxOPZSUitD2CzHzQdz7UHLr8qkdADdbtwTfJVOg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KiyOODR4tM/asL7uH8F7D1FcloqAyjpYiR7KR6bpDls7DPcJmMhEjdakr4Sc/Bw1/ mc6ZR9rqCYO3tlGQ1XFO/+Q8n6CyibqnKZgk+JGM6d053eyR4nDn2FwtijsM4p8Fg8 zYnmp+7zoRj+i9eU34l7HZBKooRpPBCIdsmbaRVw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731991AbgKCUzv (ORCPT ); Tue, 3 Nov 2020 15:55:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:56818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732393AbgKCUzr (ORCPT ); Tue, 3 Nov 2020 15:55:47 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DF812223BD; Tue, 3 Nov 2020 20:55:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436947; bh=nYkXlxOPZSUitD2CzHzQdz7UHLr8qkdADdbtwTfJVOg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1vtLphLZZf0/nfUAqV/kItOoeRonBOxQF/+RNf+kgK55eEKvSrMA8G7A+aLFOMmy0 SzErquvprso9NIrVhMPxJ0zdB+DGVNElu3g5DjVSTJpCovehp5LOMXXtgz6fXTTCs6 EPXWojVMtGuD0POQhoqTTk4ybXBggxmFWO0jfzLs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Dilger , Ritesh Harjani , Jan Kara , Theodore Tso , Sasha Levin Subject: [PATCH 5.4 081/214] ext4: Detect already used quota file early Date: Tue, 3 Nov 2020 21:35:29 +0100 Message-Id: <20201103203257.945943373@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203249.448706377@linuxfoundation.org> References: <20201103203249.448706377@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jan Kara [ Upstream commit e0770e91424f694b461141cbc99adf6b23006b60 ] 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. Reviewed-by: Andreas Dilger Reported-by: Ritesh Harjani Signed-off-by: Jan Kara Link: https://lore.kernel.org/r/20201015110330.28716-1-jack@suse.cz Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/super.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 4aae7e3e89a12..2603537b1f66b 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5856,6 +5856,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 (IS_NOQUOTA(d_inode(path->dentry))) + return -EBUSY; + /* Journaling quota? */ if (EXT4_SB(sb)->s_qf_names[type]) { /* Quotafile not in fs root? */ -- 2.27.0