Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F322175A86; Wed, 7 Oct 2026 02:03:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791338635; cv=none; b=aZr5BbH532iz7ggDs2cq86CkMBRPoMMqE07OzcvZQm3RelS00JKwaDD0mYhMAUdn/hEv373RdGWLLCOiQaR8VBEtGvM8+DiHwf8QRLaMZh7bwOAbuv7o1GJewKUVlIvmkdu5pjNdJlRw/U1bSRbNUtSBk2Gu5Yk4Rr5/ldKlOhU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791338635; c=relaxed/simple; bh=I6R+MgEYWHwW7eObQOmnaJmIgprA6XOb/GOtvYGuM9Y=; h=Date:To:From:Subject:Message-Id; b=AJJmUX9GhsN7XodX0feM6YlepnHLJoHONRocXsqBx3pHuncWXeG9Pp9xdrzXF4N44Em/xyvvLXIAc7Xg2xIz1Nx9aWmkVFudkdnidWEez1AsaNHuJDUGQqTXqn3plTFvOsVQunLjssNLalQ1168zzi0OJY9m7uT3Z/qC8GHr2L0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=CXvzdEAX; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="CXvzdEAX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E87681F0089B; Wed, 7 Oct 2026 02:03:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1791338634; bh=IAZFyv6PFeYpQZ9EbjZjM0e9oP7I5Ys8XsrjmKShJ7E=; h=Date:To:From:Subject; b=CXvzdEAXAUKfvmzvZJMg7Yn+97qCyz1cRrW3S1+8iyyZHrzQa4k/um94FwjVMIOAk Q5x85lp5iDvpMnnqOH6ggMTFUyO3Q2oWpUm/xaaSdPUrsjwzDPEf3HNsGFIOG8WG/6 j+pXugswvPcr9h76gL/zTCY68l2mnulKo2vhCwyg= Date: Tue, 06 Oct 2026 19:03:53 -0700 To: mm-commits@vger.kernel.org,yuantan098@gmail.com,yifanwucs@gmail.com,tomapufckgml@gmail.com,syzbot+e64c6472a3d96a75172a@syzkaller.appspotmail.com,syzbot+26461e903494e689c24f@syzkaller.appspotmail.com,stable@vger.kernel.org,prcups@krgm.moe,n05ec@lzu.edu.cn,bird@lzu.edu.cn,hirofumi@mail.parknet.co.jp,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-nonmm-stable] fat-fix-fat_ent_write-for-reverting-the-value.patch removed from -mm tree Message-Id: <20261007020353.E87681F0089B@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: fat: fix fat_ent_write() for reverting the value has been removed from the -mm tree. Its filename was fat-fix-fat_ent_write-for-reverting-the-value.patch This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: OGAWA Hirofumi Subject: fat: fix fat_ent_write() for reverting the value Date: Tue, 25 Aug 2026 21:11:32 +0900 commit 64d9183203ee ("fat: restore original value when fat_ent_write failed") try to revert the fatent value to old value when got the error on mirror FAT. However it didn't work if the error is when writing the fatent bh. In that case, the bh is cleared the uptodate flag, so reuse bh is invalid. Fix this by reverting the fatent only if got the error on mirror FAT. Link: https://lore.kernel.org/87ik4yz9fv.fsf_-_@mail.parknet.co.jp Fixes: 64d9183203ee ("fat: restore original value when fat_ent_write failed") Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Reported-by: syzbot+e64c6472a3d96a75172a@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=e64c6472a3d96a75172a Reported-by: syzbot+26461e903494e689c24f@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=26461e903494e689c24f Cc: Yemu Lu Cc: Ren Wei Cc: Yuan Tan Cc: Yifan Wu Cc: Juefei Pu Cc: Xin Liu Cc: --- fs/fat/fat.h | 2 +- fs/fat/fatent.c | 21 ++++++++++++++++++--- fs/fat/file.c | 3 ++- fs/fat/misc.c | 6 ++---- 4 files changed, 23 insertions(+), 9 deletions(-) --- a/fs/fat/fatent.c~fat-fix-fat_ent_write-for-reverting-the-value +++ a/fs/fat/fatent.c @@ -413,7 +413,7 @@ error: } int fat_ent_write(struct inode *inode, struct fat_entry *fatent, - int new, int wait) + int new, int old, int wait) { struct super_block *sb = inode->i_sb; const struct fatent_operations *ops = MSDOS_SB(sb)->fatent_ops; @@ -422,10 +422,25 @@ int fat_ent_write(struct inode *inode, s ops->ent_put(fatent, new); if (wait) { err = fat_sync_bhs(fatent->bhs, fatent->nr_bhs); - if (err) + if (err) { + /* + * bhs are not uptodate after I/O error. So we + * can't simply re-dirty to revert. And it + * would not have value to write again on I/O + * error. + */ return err; + } } - return fat_mirror_bhs(sb, fatent->bhs, fatent->nr_bhs); + + err = fat_mirror_bhs(sb, fatent->bhs, fatent->nr_bhs); + if (err) { + /* Try to revert if got the error on mirror FAT */ + ops->ent_put(fatent, old); + if (wait) + fat_sync_bhs(fatent->bhs, fatent->nr_bhs); + } + return err; } static inline int fat_ent_next(struct msdos_sb_info *sbi, --- a/fs/fat/fat.h~fat-fix-fat_ent_write-for-reverting-the-value +++ a/fs/fat/fat.h @@ -392,7 +392,7 @@ extern void fat_ent_access_init(struct s extern int fat_ent_read(struct inode *inode, struct fat_entry *fatent, int entry); extern int fat_ent_write(struct inode *inode, struct fat_entry *fatent, - int new, int wait); + int new, int old, int wait); extern int fat_alloc_clusters(struct inode *inode, int *cluster, int nr_cluster); extern int fat_free_clusters(struct inode *inode, int cluster); --- a/fs/fat/file.c~fat-fix-fat_ent_write-for-reverting-the-value +++ a/fs/fat/file.c @@ -363,7 +363,8 @@ static int fat_free(struct inode *inode, __func__, MSDOS_I(inode)->i_pos); ret = -EIO; } else if (ret > 0) { - err = fat_ent_write(inode, &fatent, FAT_ENT_EOF, wait); + err = fat_ent_write(inode, &fatent, FAT_ENT_EOF, ret, + wait); if (err) ret = err; } --- a/fs/fat/misc.c~fat-fix-fat_ent_write-for-reverting-the-value +++ a/fs/fat/misc.c @@ -133,11 +133,9 @@ int fat_chain_add(struct inode *inode, i ret = fat_ent_read(inode, &fatent, last); if (ret >= 0) { int wait = inode_needs_sync(inode); - int old = ret; - ret = fat_ent_write(inode, &fatent, new_dclus, wait); - if (ret < 0) - fat_ent_write(inode, &fatent, old, wait); + ret = fat_ent_write(inode, &fatent, new_dclus, ret, + wait); fatent_brelse(&fatent); } if (ret < 0) _ Patches currently in -mm which might be from hirofumi@mail.parknet.co.jp are