From nobody Fri Oct 2 01:56:25 2026 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D8953D891F for ; Thu, 6 Aug 2026 06:18:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785997103; cv=none; b=JHLSaZ0RBr8GmfHxuNxBoY4cCKjr2dC6svfhEC49ibMI8cUAZagxfNPKqMwvsBUQQVaKFadKUTVwRpqadwqxBlPRljiCVNMETLXQ4qOSGu76Qq9LscncDRPaAbPQRE270dOtGWuvO1NgvAXVbjq+jdpRHBF2RAztHC1Ed6g7sWU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785997103; c=relaxed/simple; bh=iZkgiOLwf7aszHl0Q0iFXQ8g078ZSuRDM9dxcnDcoc0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=JLk2u2DheJ296CCfkRZmaOsl2tDVEwyPSn9nH04G34bM579/yHpCyEC5TczvKdxcdOTuW8U+5HP6a1BH40auZHwuMChtwdPJNjO0GWtcVGqAtwUB2UedMrIqKnaV9BVLWhgkvblmqbBgwx8zE02xa+ktdBiPd6hJdjh0Q6h4WAM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AIhM1VD1; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AIhM1VD1" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2cf52d15d88so17584425ad.2 for ; Wed, 05 Aug 2026 23:18:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785997100; x=1786601900; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=M8JM6V1ymmgGXeBCeCu5VkItAJJqMydVFPaZbf5Vqt0=; b=AIhM1VD1OGm5IxGzgyIJUxByQxG91cJJMekEs+/saEhqa47xeAyrQIXFqXQHFyjyeU lcfZQcjGjPR9N4op9Yh/KFwegAY6q+CuhFxrqctCYiP7jxbqS+DrzosrF8jjXbb92gtK jwldeC4cwb0S5mkp6Eob5efL7yEev/G2u/RNBWWzzk+fpcLWbk1H2MKL41yzguS/Z7nS +GmFyArndv2NW8lEwalLYXUnregtSZS4l+uJgJwGnxNtLISH+fvDk6/RhNRE9LKUKEBS XtTzY0l06kSEoolkPiOlNTfdsvqUy149qV42vMfdevHlWhMEtbNulV/iw6TjZPGgJoW4 nfXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785997100; x=1786601900; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=M8JM6V1ymmgGXeBCeCu5VkItAJJqMydVFPaZbf5Vqt0=; b=Kj7AL5tD1U3P8OCRD4ohRP/4G1gqtMAMDDDkAcoAG9/MJ/KTB70HMYnTopfSk4WWH3 HHIjA+ONdj3d6PUtd5+zCzZrqii+kuTCW18TaKCBK86Y8DdOPRPBJ1xC/x6DbcofDB0e aBC7M7O+Hb7W8dB5+gvgzfaAv0VKZe/rniW1B8PAFW6rgZLh4mQtOatg70s0xlnR+T1m t6QrvPpYWD3M/CVQ0LHzxKuDPWveMrl3DvxGlRkoBvbqz7DbUU8PtoxeSqx1/MeZIWId Q0W1gWmc/yAHwIs4qI6Z0FVUsUZ8e0aAvroav6PAi7jQQAdOcbc9WhYgMJMMt5hAMB7E Kyvw== X-Forwarded-Encrypted: i=1; AHgh+RqQSqTAU1/l/VMYk14ZjEzX2x/KtqONd0QBgXwTSpAchJiPULIYObwcE9cJdbaW1h8HO5O0ofBn880IXPA=@vger.kernel.org X-Gm-Message-State: AOJu0YwSKXrnyGHOCoSvqVYSFnn9y3Th2F3nUnKYd08HSg+AXYiiSnFH T0Tdzgy3kPRIfLhzaeoziQfrayvo7wNBOFnpJtl8ZPXYVpfaeomgA6PJ X-Gm-Gg: AR+sD10yJnX5+xT4vBjMSoLo4kta0XUKN18Utcq0KW35btgVSS+vJSwOlFmUF7jLbPF p1qeId8zU7unKf8HEUxjOvAc1VvxcexOyOywKOrKBDIHUUO9ptYxrSoCV00pEgZ2KUF91rbL++6 2IB7zKMNzxGqWhpznTjKdymew21XTUC4DEoHybFU7kK5wsT1gAhOghBNZFG4qPSCREV5ppDbCsy NyahAdOx/sz3LGJ0zv2YcTimlnIActLOs38Mfv4ZL8NkoMhhE690hJENkK5vi4DKKEaVJ5+4Sfv b5ZioEa1otRGBo4HgTnKFeEHqmf4xeoyRMMbPivATdg9U34hCImx+Z3b1juPiRmkRmfRNlCY6wI G3Q+nUQTfHn2wg0sKNql3ut1nEeE7I21lSEgKqiSHiR2cd0iea9Z/WPoRZMDOeo36jky9vlJnas F0EG18AmGeh2aqzgi8E3whK0jB5+ACw7dg9C62G4fui5wwBZQt7wM83ea6wxvhf1P+63IMoZ1aL jlt20REE831QoqGAFdUIjwZ5rpd97ROdaA= X-Received: by 2002:a17:902:d547:b0:2c9:b8b7:5d1c with SMTP id d9443c01a7336-2d0ca7faee4mr143840725ad.16.1785997095610; Wed, 05 Aug 2026 23:18:15 -0700 (PDT) Received: from qiwenjie-ThinkCentre-M760t.mioffice.cn ([43.224.245.241]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d0aa492545sm25777555ad.48.2026.08.05.23.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2026 23:18:15 -0700 (PDT) From: Wenjie Qi X-Google-Original-From: Wenjie Qi To: jaegeuk@kernel.org, chao@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, qiwenjie@xiaomi.com, qwjhust@gmail.com, stable@kernel.org Subject: [PATCH] f2fs: check cp_error before committing atomic writes Date: Thu, 6 Aug 2026 14:18:07 +0800 Message-ID: <20260806061807.3267392-1-qiwenjie@xiaomi.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" F2FS checks cp_error before entering the ioctl path, but cp_error can be set after that and before atomic commit starts replacing blocks. In that case, F2FS_IOC_COMMIT_ATOMIC_WRITE returns -EIO, but the current mount can still expose the new data before remount. Check cp_error again in f2fs_commit_atomic_write() after filemap_write_and_wait_range() and before block replacement starts. Fixes: 3db1de0e582c ("f2fs: change the current atomic write way") Cc: stable@kernel.org Signed-off-by: Wenjie Qi --- fs/f2fs/segment.c | 3 +++ 1 file changed, 3 insertions(+) QEMU validation: - before fix, FAULT_CHECKPOINT made COMMIT_ATOMIC_WRITE fail with -EIO, while the current mount still exposed the new data; after remount, the file reverted to the old data. - after fix, the same fault still failed with -EIO, and both the current mount and the remounted filesystem kept the old data. - no-fault smoke still committed the new data successfully and preserved it across remount. diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 0b706568b034..e6384dd2e916 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -408,6 +408,9 @@ int f2fs_commit_atomic_write(struct inode *inode) if (err) return err; =20 + if (unlikely(f2fs_cp_error(sbi))) + return -EIO; + f2fs_down_write(&fi->i_gc_rwsem[WRITE]); f2fs_lock_op(sbi, &lc); =20 --=20 2.43.0