From: Jan Kara <jack@xxxxxxx> 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit a8d4205623ae965e36c68629db306ca0695a2771 upstream. When we fail to allocate page vector in rbd_obj_read_sync() we just basically ignore the problem and continue which will result in an oops later. Fix the problem by returning proper error. CC: Yehuda Sadeh <yehuda@xxxxxxxxxxx> CC: Sage Weil <sage@xxxxxxxxxxx> CC: ceph-devel@xxxxxxxxxxxxxxx Coverity-id: 1226882 Signed-off-by: Jan Kara <jack@xxxxxxx> Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxxx> Signed-off-by: Jiri Slaby <jslaby@xxxxxxx> --- drivers/block/rbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index aeeb62e0981a..a86841886acc 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3220,7 +3220,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev, page_count = (u32) calc_pages_for(offset, length); pages = ceph_alloc_page_vector(page_count, GFP_KERNEL); if (IS_ERR(pages)) - ret = PTR_ERR(pages); + return PTR_ERR(pages); ret = -ENOMEM; obj_request = rbd_obj_request_create(object_name, offset, length, -- 2.1.3 -- 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