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=1795045336; b=kaFwgsnTHhBf7uCH8gp/DIC6HyfhhEfsUu1xVUsitr4kka5oCp3/tuL5mXdci6hW4Ykc 2956T8MZugirwlYgjmhbsCjzrObpspZ5k9J7Fa2raWJ1oRzR+9KIUeIcAHtb6EcyqXfHL L8ZETldh5crSArPCKZsz6Mosw9Z31PYqZEdebsgEyWNr/edk1w4c11vuYs6ma0r2l46Xr C5OWE2cHX+E6gshYyyk33VKIoBoIFBopSjLF1ci1e93NO1p6Ls6MuxII8aahOLVDRMRAv APkcBvH5ujNtil7LF7himijA1Ahje0m+YWKt3cn4/oA6rN6HBQvJXViEtj4dJYiq8kA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795045336; 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=4tCmFOynMxpP1IV44l+lWbUQYFhfc3HbPOZy9ooY5ag=; b=tShw5ab/gO+ukzpj9ESDlc+AQAqrv/9h3DuKhQ5tWEefn8h+MAAH02IwSB+nmMc+avv7 OobCIg/L4Wq4v11rmNa/K2R9JKmGAB6DCUUkcG4jr1EYfkowA86idyKQ9TIlO8r8Sp78/ u4O0GWywPpwbB2Qnb7xq/e7JArlOQwr6yZIbfMJy7i+fnAGQWTBnF+z2cFlQrsyZGaWI7 4OhPccjoQ7/occv/HEgizjCAEsLT72cqL/RaWwLhS5R1JA4+33qAs0mHDenXT0/cAMiuD uGKcqEbYrBCuEuSv9mU/TtbtMTKLCASA3T7z7o+WO49giNdi2k5sQoZzMvO8yobKXTg== 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=mOMwafqv; 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 D1DB9606A325; Wed, 18 Nov 2026 23:42:16 +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=mOMwafqv Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2F0E1F000C4; Wed, 18 Nov 2026 23:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795045336; bh=4tCmFOynMxpP1IV44l+lWbUQYFhfc3HbPOZy9ooY5ag=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mOMwafqvIhiIOnMnJw8qdGMgtPqMJe+LAkpFkavyHUMXh1s0zRdnVHUAp0Pmp7RRP HyYZRYhgUya3+5yI86bL4TG1flC8PgBSdVd949ocKWOyd9ZnBmDzZzOJtElBdRyr4i gWJ273yB+LJOdjNirEccYFxkqGoK3lQ2bEaIDtpg= 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 6.1 0885/2857] fat: fix fat_ent_write() for reverting the value Date: Wed, 18 Nov 2026 15:31:59 +0100 Message-ID: <20261118150233.423247246@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@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 6.1-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 a415c02ede39f..6fbf928f47680 100644 --- a/fs/fat/fat.h +++ b/fs/fat/fat.h @@ -386,7 +386,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 1db348f8f887a..1288947a41f03 100644 --- a/fs/fat/fatent.c +++ b/fs/fat/fatent.c @@ -408,7 +408,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; @@ -417,10 +417,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 8a6b493b5b5f6..c1dcc7b3c8f6b 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c @@ -360,7 +360,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 ea0239fb0e1c4..7d8b7d3925b73 100644 --- a/fs/fat/misc.c +++ b/fs/fat/misc.c @@ -133,11 +133,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