From: Greg Kroah-Hartman Date: Sun, 14 Aug 2016 19:46:49 +0000 (+0200) Subject: 3.14-stable patches X-Git-Tag: v3.14.76~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c744ab8dca2dd767f621512e620ff2cf4163491;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: ext4-fix-reference-counting-bug-on-block-allocation-error.patch --- diff --git a/queue-3.14/ext4-fix-reference-counting-bug-on-block-allocation-error.patch b/queue-3.14/ext4-fix-reference-counting-bug-on-block-allocation-error.patch new file mode 100644 index 00000000000..3211d532f73 --- /dev/null +++ b/queue-3.14/ext4-fix-reference-counting-bug-on-block-allocation-error.patch @@ -0,0 +1,74 @@ +From 554a5ccc4e4a20c5f3ec859de0842db4b4b9c77e Mon Sep 17 00:00:00 2001 +From: Vegard Nossum +Date: Thu, 14 Jul 2016 23:02:47 -0400 +Subject: ext4: fix reference counting bug on block allocation error + +From: Vegard Nossum + +commit 554a5ccc4e4a20c5f3ec859de0842db4b4b9c77e upstream. + +If we hit this error when mounted with errors=continue or +errors=remount-ro: + + EXT4-fs error (device loop0): ext4_mb_mark_diskspace_used:2940: comm ext4.exe: Allocating blocks 5090-6081 which overlap fs metadata + +then ext4_mb_new_blocks() will call ext4_mb_release_context() and try to +continue. However, ext4_mb_release_context() is the wrong thing to call +here since we are still actually using the allocation context. + +Instead, just error out. We could retry the allocation, but there is a +possibility of getting stuck in an infinite loop instead, so this seems +safer. + +[ Fixed up so we don't return EAGAIN to userspace. --tytso ] + +Fixes: 8556e8f3b6 ("ext4: Don't allow new groups to be added during block allocation") +Signed-off-by: Vegard Nossum +Signed-off-by: Theodore Ts'o +Cc: Aneesh Kumar K.V +Signed-off-by: Greg Kroah-Hartman + +--- + fs/ext4/mballoc.c | 17 +++-------------- + 1 file changed, 3 insertions(+), 14 deletions(-) + +--- a/fs/ext4/mballoc.c ++++ b/fs/ext4/mballoc.c +@@ -2897,7 +2897,7 @@ ext4_mb_mark_diskspace_used(struct ext4_ + ext4_error(sb, "Allocating blocks %llu-%llu which overlap " + "fs metadata", block, block+len); + /* File system mounted not to panic on error +- * Fix the bitmap and repeat the block allocation ++ * Fix the bitmap and return EFSCORRUPTED + * We leak some of the blocks here. + */ + ext4_lock_group(sb, ac->ac_b_ex.fe_group); +@@ -2906,7 +2906,7 @@ ext4_mb_mark_diskspace_used(struct ext4_ + ext4_unlock_group(sb, ac->ac_b_ex.fe_group); + err = ext4_handle_dirty_metadata(handle, NULL, bitmap_bh); + if (!err) +- err = -EAGAIN; ++ err = -EFSCORRUPTED; + goto out_err; + } + +@@ -4476,18 +4476,7 @@ repeat: + } + if (likely(ac->ac_status == AC_STATUS_FOUND)) { + *errp = ext4_mb_mark_diskspace_used(ac, handle, reserv_clstrs); +- if (*errp == -EAGAIN) { +- /* +- * drop the reference that we took +- * in ext4_mb_use_best_found +- */ +- ext4_mb_release_context(ac); +- ac->ac_b_ex.fe_group = 0; +- ac->ac_b_ex.fe_start = 0; +- ac->ac_b_ex.fe_len = 0; +- ac->ac_status = AC_STATUS_CONTINUE; +- goto repeat; +- } else if (*errp) { ++ if (*errp) { + ext4_discard_allocated_blocks(ac); + goto errout; + } else { diff --git a/queue-3.14/series b/queue-3.14/series index 326fd14c0a4..3ec451a7e39 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -26,3 +26,4 @@ bonding-set-carrier-off-for-devices-created-through-netlink.patch net-irda-fix-null-pointer-dereference-on-memory-allocation-failure.patch tcp-consider-recv-buf-for-the-initial-window-scale.patch tcp-make-challenge-acks-less-predictable.patch +ext4-fix-reference-counting-bug-on-block-allocation-error.patch