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=-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=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 D6411C43381 for ; Sat, 30 Mar 2019 01:35:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9EAB9217F5 for ; Sat, 30 Mar 2019 01:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553909707; bh=ueJ+56bGHPCtuqbCYcBYODHnx776xj68ZyFdw69k0r8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XX3fkvcLhnG9rYAUDBmX1zk4mfH53Ga3fBxua6QRoSn1w8nTHyMfemqlucpGkHuf0 d+fB2pxdo3Gcu161S8nuAKBIb7LgBl/IZ2aIArha9Qo4K3wHlcScBhIKPMkkemYGnR 2joZDTjTai8oOShH3wCbgEnUAbl7VJcpk1bRmm2g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732170AbfC3Bbt (ORCPT ); Fri, 29 Mar 2019 21:31:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:39568 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732159AbfC3Bbr (ORCPT ); Fri, 29 Mar 2019 21:31:47 -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 D8D54217F5; Sat, 30 Mar 2019 01:31:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553909506; bh=ueJ+56bGHPCtuqbCYcBYODHnx776xj68ZyFdw69k0r8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v3Au+cc9u6pHXtxZTBmsnDQK1/fWfB8NUAqEE37bVL17/c8ou+Bd/h0WxdRFPmobj kDateK2VKGBo0do4ZtQU/3hJ8cjMcGj59Gwm9rXtfjMWp7ZnKI/VYRZ/TMjw/GDjp0 li9zumSY+uhvJaaHDKPvYO5AtEYK6fuX0TGnBb04= 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.9 16/21] ext4: prohibit fstrim in norecovery mode Date: Fri, 29 Mar 2019 21:31:07 -0400 Message-Id: <20190330013112.784-16-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330013112.784-1-sashal@kernel.org> References: <20190330013112.784-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@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 2880e017cd0a..2ce73287b53c 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -749,6 +749,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