This is a note to let you know that I've just added the patch titled
ext4: check error return from ext4_write_inline_data_end()
to the 3.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ext4-check-error-return-from-ext4_write_inline_data_end.patch
and it can be found in the queue-3.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 42c832debbbf819f6c4ad8601baa559c44105ba4 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@xxxxxxx>
Date: Mon, 1 Jul 2013 08:12:39 -0400
Subject: ext4: check error return from ext4_write_inline_data_end()
From: Theodore Ts'o <tytso@xxxxxxx>
commit 42c832debbbf819f6c4ad8601baa559c44105ba4 upstream.
The function ext4_write_inline_data_end() can return an error. So we
need to assign it to a signed integer variable to check for an error
return (since copied is an unsigned int).
Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
Cc: Zheng Liu <wenqing.lz@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/ext4/inode.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1095,10 +1095,13 @@ static int ext4_generic_write_end(struct
struct inode *inode = mapping->host;
handle_t *handle = ext4_journal_current_handle();
- if (ext4_has_inline_data(inode))
- copied = ext4_write_inline_data_end(inode, pos, len,
- copied, page);
- else
+ if (ext4_has_inline_data(inode)) {
+ ret = ext4_write_inline_data_end(inode, pos, len,
+ copied, page);
+ if (ret < 0)
+ goto errout;
+ copied = ret;
+ } else
copied = block_write_end(file, mapping, pos,
len, copied, page, fsdata);
Patches currently in stable-queue which might be from tytso@xxxxxxx are
queue-3.9/ext4-fix-corruption-when-online-resizing-a-fs-with-1k-block-size.patch
queue-3.9/jbd2-fix-theoretical-race-in-jbd2__journal_restart.patch
queue-3.9/ext3-ext4-don-t-mess-with-dir_file-f_pos-in-htree_dirblock_to_tree.patch
queue-3.9/ext4-check-error-return-from-ext4_write_inline_data_end.patch
queue-3.9/jbd2-move-superblock-checksum-calculation-to-jbd2_write_superblock.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html