From: Greg Kroah-Hartman Date: Wed, 14 May 2014 00:20:55 +0000 (-0700) Subject: 3.14-stable patches X-Git-Tag: v3.4.91~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43223507f0a4318c21d179a35cab714a9805c15e;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: rbd-fix-error-paths-in-rbd_img_request_fill.patch --- diff --git a/queue-3.14/rbd-fix-error-paths-in-rbd_img_request_fill.patch b/queue-3.14/rbd-fix-error-paths-in-rbd_img_request_fill.patch new file mode 100644 index 00000000000..b4b465f143d --- /dev/null +++ b/queue-3.14/rbd-fix-error-paths-in-rbd_img_request_fill.patch @@ -0,0 +1,41 @@ +From 42dd037c08c7cd6e3e9af7824b0c1d063f838885 Mon Sep 17 00:00:00 2001 +From: Ilya Dryomov +Date: Tue, 4 Mar 2014 11:57:17 +0200 +Subject: rbd: fix error paths in rbd_img_request_fill() + +From: Ilya Dryomov + +commit 42dd037c08c7cd6e3e9af7824b0c1d063f838885 upstream. + +Doing rbd_obj_request_put() in rbd_img_request_fill() error paths is +not only insufficient, but also triggers an rbd_assert() in +rbd_obj_request_destroy(): + + Assertion failure in rbd_obj_request_destroy() at line 1867: + + rbd_assert(obj_request->img_request == NULL); + +rbd_img_obj_request_add() adds obj_requests to the img_request, the +opposite is rbd_img_obj_request_del(). Use it. + +Fixes: http://tracker.ceph.com/issues/7327 + +Signed-off-by: Ilya Dryomov +Reviewed-by: Alex Elder +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/block/rbd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/block/rbd.c ++++ b/drivers/block/rbd.c +@@ -2253,7 +2253,7 @@ out_partial: + rbd_obj_request_put(obj_request); + out_unwind: + for_each_obj_request_safe(img_request, obj_request, next_obj_request) +- rbd_obj_request_put(obj_request); ++ rbd_img_obj_request_del(img_request, obj_request); + + return -ENOMEM; + } diff --git a/queue-3.14/series b/queue-3.14/series index 51891ad9a9d..3e093e74f2f 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -12,3 +12,4 @@ netfilter-can-t-fail-and-free-after-table-replacement.patch netfilter-nf_tables-set-names-cannot-be-larger-than-15-bytes.patch x86-preempt-fix-preemption-for-i386.patch tracepoint-do-not-waste-memory-on-mods-with-no-tracepoints.patch +rbd-fix-error-paths-in-rbd_img_request_fill.patch