From a89ae70bcfe434dcf4e41dba586cf26fe308d028 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 27 May 2019 13:27:11 +0200 Subject: [PATCH] 4.9-stable patches added patches: ext4-do-not-delete-unlinked-inode-from-orphan-list-on-failed-truncate.patch --- ...-from-orphan-list-on-failed-truncate.patch | 37 +++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-4.9/ext4-do-not-delete-unlinked-inode-from-orphan-list-on-failed-truncate.patch diff --git a/queue-4.9/ext4-do-not-delete-unlinked-inode-from-orphan-list-on-failed-truncate.patch b/queue-4.9/ext4-do-not-delete-unlinked-inode-from-orphan-list-on-failed-truncate.patch new file mode 100644 index 00000000000..59d9cc6ad7f --- /dev/null +++ b/queue-4.9/ext4-do-not-delete-unlinked-inode-from-orphan-list-on-failed-truncate.patch @@ -0,0 +1,37 @@ +From ee0ed02ca93ef1ecf8963ad96638795d55af2c14 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Thu, 23 May 2019 23:35:28 -0400 +Subject: ext4: do not delete unlinked inode from orphan list on failed truncate + +From: Jan Kara + +commit ee0ed02ca93ef1ecf8963ad96638795d55af2c14 upstream. + +It is possible that unlinked inode enters ext4_setattr() (e.g. if +somebody calls ftruncate(2) on unlinked but still open file). In such +case we should not delete the inode from the orphan list if truncate +fails. Note that this is mostly a theoretical concern as filesystem is +corrupted if we reach this path anyway but let's be consistent in our +orphan handling. + +Reviewed-by: Ira Weiny +Signed-off-by: Jan Kara +Signed-off-by: Theodore Ts'o +Cc: stable@kernel.org +Signed-off-by: Greg Kroah-Hartman + +--- + fs/ext4/inode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/ext4/inode.c ++++ b/fs/ext4/inode.c +@@ -5223,7 +5223,7 @@ int ext4_setattr(struct dentry *dentry, + up_write(&EXT4_I(inode)->i_data_sem); + ext4_journal_stop(handle); + if (error) { +- if (orphan) ++ if (orphan && inode->i_nlink) + ext4_orphan_del(NULL, inode); + goto err_out; + } diff --git a/queue-4.9/series b/queue-4.9/series index e69de29bb2d..36815308b09 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -0,0 +1 @@ +ext4-do-not-delete-unlinked-inode-from-orphan-list-on-failed-truncate.patch -- 2.39.5