From mboxrd@z Thu Jan 1 00:00:00 1970 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 14201415F14; Tue, 21 Jul 2026 19:24:13 +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=1784661854; cv=none; b=uzPguPCQidJJGhvszwxVXJsF8spEtE0gI3pqvWonZh/SB3ZX9zqGYEx/C+kP32Eh/sAYklczq7NKFBHOpjCje3Cdeoz31zHMuwf42rzXKQDr9OaeIfwqoE/eSHso8f41Gdp9xmesE4Lqs32TNRrML1ohlQ40d8/Iu5Rhmv3evkI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784661854; c=relaxed/simple; bh=47JJiNHu79TAdeBqY1kluyXzvjQ5Z+jxKAjBupGaLqY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r6YwN28aN3ftssgPoXkcwJZSznmSffSHnR0wZBQvYbDtY2Wt19QlqEM5pPdgqePNkEfBcvaDpGVUzKmKhkqtXgNK/Jm9dwF7lHG31lnMbZIi1B+TinijM8jlzF0VOPFzsQ3+jZLLv96ywoCxGA6RkQEVCx2jZX1sYRf6SsiwwDo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KDfXA6oG; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="KDfXA6oG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73F831F000E9; Tue, 21 Jul 2026 19:24:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784661853; bh=SlK6NgKA1rF9ZCB+kzzEjZ9iFODVWZxDTKRqwpd/Dwc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KDfXA6oG59YkQOx7QFZRQZx63GEZ6ZZhM4PoR7uA9DN7FrM003ICy8XGOQBFRu8Ja 4VSxvnzDCymN2hLjiXKRHxO4kYAwR6xFHGyUZSzNlD4FvkizJN1BjiliVe0wOPGj00 Fikj5vYLGZywbi6SEfIp2gF/SOjOvcpVJzriRTOs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Danila Chernetsov , Jan Kara , Sasha Levin Subject: [PATCH 6.12 0221/1276] ext2: fix ignored return value of generic_write_sync() Date: Tue, 21 Jul 2026 17:11:04 +0200 Message-ID: <20260721152451.032851365@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152446.065700225@linuxfoundation.org> References: <20260721152446.065700225@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Danila Chernetsov [ Upstream commit a4659be0bc7cb1856ffb15b67f903229ae8891ec ] Fix ext2_dio_write_iter() to propagate the error returned by generic_write_sync() instead of silently discarding it, which could cause write(2) to return success to userspace on O_SYNC/O_DSYNC files even when the sync failed. The correct pattern, already used in ext2_dax_write_iter() in the same file and in ext4, xfs, f2fs among others, is: if (ret > 0) ret = generic_write_sync(iocb, ret); Found by Linux Verification Center (linuxtesting.org) with SVACE. [JK: Reflect also filemap_write_and_wait() return value] Fixes: fb5de4358e1a ("ext2: Move direct-io to use iomap") Signed-off-by: Danila Chernetsov Link: https://patch.msgid.link/20260530122311.136803-1-listdansp@mail.ru Signed-off-by: Jan Kara Signed-off-by: Sasha Levin --- fs/ext2/file.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/ext2/file.c b/fs/ext2/file.c index 10b061ac5bc098..908d4849874da8 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c @@ -262,12 +262,15 @@ static ssize_t ext2_dio_write_iter(struct kiocb *iocb, struct iov_iter *from) endbyte = pos + status - 1; ret2 = filemap_write_and_wait_range(inode->i_mapping, pos, endbyte); - if (!ret2) + if (!ret2) { invalidate_mapping_pages(inode->i_mapping, pos >> PAGE_SHIFT, endbyte >> PAGE_SHIFT); - if (ret > 0) - generic_write_sync(iocb, ret); + if (ret > 0) + ret = generic_write_sync(iocb, ret); + } else { + ret = ret2; + } } out_unlock: -- 2.53.0