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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 155A8C43381 for ; Sat, 30 Mar 2019 00:55:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D32C6218AC for ; Sat, 30 Mar 2019 00:55:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907358; bh=DmawPRaMrk1HaIMhcxgDMlWe2Oo1jLyWLs30oNu+jug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MZ9yz83j8H3l4OLMS+2egC37EWYpkOawRf0TPK/f11bLxfIvzETCBw5y0d6kpGMEB 07nLcrVv+pF2cuzG4h+qhE91kVtQZggSbW6h5vyoI9USeNdXp/Vxmtkr82fj0pcI8Z 1Vfwoce5hYCtOFjs2bywMMY83xAVsAGHpqXsukzE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731371AbfC3Az5 (ORCPT ); Fri, 29 Mar 2019 20:55:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:35248 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731843AbfC3Azx (ORCPT ); Fri, 29 Mar 2019 20:55:53 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 622FF218AC; Sat, 30 Mar 2019 00:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907353; bh=DmawPRaMrk1HaIMhcxgDMlWe2Oo1jLyWLs30oNu+jug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oRuzwWW3uCofR2AFdjGHGL9aZyv7DN2+rlWxZr3oFFHyrSssJyo5l4SPmQmpGhDIq zwDYOi7UzEIwMDcVlCZigf5Ez1Swqw1Hrot+E6QkMBvNjk8suJnUJKyN9AD6J/YBzM TIZu7T1QlYcPwgIBRgf4spQFwD/SD0luIumQko1Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Darrick J. Wong" , Theodore Ts'o , Sasha Levin , linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 37/37] ext4: prohibit fstrim in norecovery mode Date: Fri, 29 Mar 2019 20:54:38 -0400 Message-Id: <20190330005441.27540-37-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330005441.27540-1-sashal@kernel.org> References: <20190330005441.27540-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "Darrick J. Wong" [ Upstream commit 18915b5873f07e5030e6fb108a050fa7c71c59fb ] The ext4 fstrim implementation uses the block bitmaps to find free space that can be discarded. If we haven't replayed the journal, the bitmaps will be stale and we absolutely *cannot* use stale metadata to zap the underlying storage. Signed-off-by: Darrick J. Wong Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/ioctl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 7917cc89ab21..3dbf4e414706 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -940,6 +940,13 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) if (!blk_queue_discard(q)) return -EOPNOTSUPP; + /* + * We haven't replayed the journal, so we cannot use our + * block-bitmap-guided storage zapping commands. + */ + if (test_opt(sb, NOLOAD) && ext4_has_feature_journal(sb)) + return -EROFS; + if (copy_from_user(&range, (struct fstrim_range __user *)arg, sizeof(range))) return -EFAULT; -- 2.19.1