From patchwork Tue Nov 3 20:37:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 317014 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=unavailable 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 A8651C388F9 for ; Tue, 3 Nov 2020 21:17:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 59942206A5 for ; Tue, 3 Nov 2020 21:17:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604438231; bh=ReV1V7pMKD9At0XOvgCgrQ2xGFrSYOtpAOr9izbozR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bblOlc1hRkhEbDMFuDds42El4+iL5JCfKsVJ/BVA4HESQ1xc1AwC6VJUP/bmSJ9Vx MwGI47gJV6+xaXPjvpPQZdCuDHz9+mFNkEchdpALEisEtvBVr282gQMDq/DuPTC2WO Q23NX2ygkRPPwLZOaTiSwHQSU0fl8cE3TnuqX8iQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388745AbgKCVKg (ORCPT ); Tue, 3 Nov 2020 16:10:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:51584 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388742AbgKCVKf (ORCPT ); Tue, 3 Nov 2020 16:10:35 -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 20DE5207BC; Tue, 3 Nov 2020 21:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437834; bh=ReV1V7pMKD9At0XOvgCgrQ2xGFrSYOtpAOr9izbozR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jQzLs2NJ/Ne7OBuRbxXfNkC3EKrxANLq+0RCMI00GTAgFXrBGzEjREJTau7GmGvr2 RbpyUBueS4fSLJ0c80FWKc2qqHYqNdFbdrbB4MZtnLozC6wYwqBsrbPysUrZSeldec 2fmY8/RTNcArakNZwaVNKljoP6bREG3fM4dNJWt4= 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 4.14 051/125] ext4: Detect already used quota file early Date: Tue, 3 Nov 2020 21:37:08 +0100 Message-Id: <20201103203204.374370157@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203156.372184213@linuxfoundation.org> References: <20201103203156.372184213@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@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 634c822d1dc98..d941b0cee5f8e 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5626,6 +5626,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? */