From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795058412; b=l0gKvus+SJdCwyzHE+Mm8Ccq6Ke2wCffYiu7UCrRqGYRooME73mW8vJ1iNvY4TUH2hd/ 3SsQM0UPSdSXuGXpxAZ8SCniGttkcas3VQsZRv33xSqyW9wxeE9MYzYylWwpK143YDKDO mzPqknnEMVi0oS1GD5TkRV3GFJIXHvPqTmwcFKwAbULDmcWXxkSVD3IzIrz1htiQb+PGn xCACja9tEmGbR+aQve7tdrVi8ub4YmCHm9GKVnTAq/iIvvRp5EwC4lAsxpFoaIFP9Eqyj s8HUfE27eMYSrqeAyAItYofml5FJ/geeUuCPtZTOhOmmgRajJlwBBLewIEst9FclMxA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795058412; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=425ICysV3znMQ4XhNP6q1+qthb0b5wTaHSYVT0dmH2I=; b=jAipna4vEYoZxkmHlpa55Kmexf1kdUgeGjVjBzkyjcCjkJGJvUAhIdqG/BwtfbyZaZ5d XAmNV6v0vX7f+A17M2xixqnUXqqSWMSMEgw+orEeh/6r+6EQmMgjaywJeGGJqar1rQTqD WRAKHemJ60K/rbiHBw1dbNclIniUvQ3QBC56jM2Weoh5uRkVXkyFsZWYTr4AgqjUUhQea JqFRM3uHOWe0Kw6HrChXlqkSlMA3KJ7mu6dVkD4SZh3OQt85wfVpILcrVY+gTxVGFoBhS jB2CwXLWEvrdeZrKRMEToKlW0h8odEA86h5tieZX0Trj6DNCcPYhkSRxcUs7bKfxXcQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=XXoaQoHT; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6806D606A31C; Thu, 19 Nov 2026 03:20:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=XXoaQoHT Received: by smtp.kernel.org (Postfix) with ESMTPSA id 867891F000C5; Thu, 19 Nov 2026 03:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795058412; bh=425ICysV3znMQ4XhNP6q1+qthb0b5wTaHSYVT0dmH2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XXoaQoHTwztxNF9FokESiOieh/SCr+pBkMtDcnaj0t9wXfYt/nvunfTeCJVyGs7kr cJgO+nOyTYRInNU7uOiJHf9B6iXKKcRM3DPPvlIzh/WEVdQCOnZwgy7iaMvsWpUXjn 9gS+qzX20kBZ6yVRY6AVvLNR7ZsiX97ouNMAhP88= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, OGAWA Hirofumi , Andrew Morton , syzbot+e64c6472a3d96a75172a@syzkaller.appspotmail.com, syzbot+26461e903494e689c24f@syzkaller.appspotmail.com, Yemu Lu , Ren Wei , Yuan Tan , Yifan Wu , Juefei Pu , Xin Liu , Sasha Levin Subject: [PATCH 5.10 0475/1848] fat: fix fat_ent_write() for reverting the value Date: Wed, 18 Nov 2026 15:41:53 +0100 Message-ID: <20261118145934.168393953@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: OGAWA Hirofumi [ Upstream commit 63c4b67ee163b2a67a7561314bf2106d6c79c53c ] 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: Signed-off-by: Sasha Levin --- 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(-) diff --git a/fs/fat/fat.h b/fs/fat/fat.h index 922a0c6ba46c4..b7cb9a582fc69 100644 --- a/fs/fat/fat.h +++ b/fs/fat/fat.h @@ -385,7 +385,7 @@ extern void fat_ent_access_init(struct super_block *sb); 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); diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c index 353735032947c..27c7211542066 100644 --- a/fs/fat/fatent.c +++ b/fs/fat/fatent.c @@ -407,7 +407,7 @@ static int fat_mirror_bhs(struct super_block *sb, struct buffer_head **bhs, } 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; @@ -416,10 +416,25 @@ int fat_ent_write(struct inode *inode, struct fat_entry *fatent, 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, diff --git a/fs/fat/file.c b/fs/fat/file.c index f9ee27cf4d7c2..12578fdc06f0a 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c @@ -359,7 +359,8 @@ static int fat_free(struct inode *inode, int skip) __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; } diff --git a/fs/fat/misc.c b/fs/fat/misc.c index 87c6a3db5509e..a5ebb7a5e87f2 100644 --- a/fs/fat/misc.c +++ b/fs/fat/misc.c @@ -127,11 +127,9 @@ int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster) 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) -- 2.53.0