From patchwork Wed Nov 12 01:18:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 5281981 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4F1B89F2ED for ; Wed, 12 Nov 2014 02:00:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 805A720103 for ; Wed, 12 Nov 2014 02:00:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B36E200E3 for ; Wed, 12 Nov 2014 02:00:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161220AbaKLB4k (ORCPT ); Tue, 11 Nov 2014 20:56:40 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:33160 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161218AbaKLB4j (ORCPT ); Tue, 11 Nov 2014 20:56:39 -0500 Received: from localhost (unknown [59.10.106.2]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 67A809CA; Wed, 12 Nov 2014 01:56:38 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yehuda Sadeh , Sage Weil , ceph-devel@vger.kernel.org, Jan Kara , Ilya Dryomov Subject: [PATCH 3.10 117/123] rbd: Fix error recovery in rbd_obj_read_sync() Date: Wed, 12 Nov 2014 10:18:03 +0900 Message-Id: <20141112011724.286614459@linuxfoundation.org> X-Mailer: git-send-email 2.1.3 In-Reply-To: <20141112011718.985171261@linuxfoundation.org> References: <20141112011718.985171261@linuxfoundation.org> User-Agent: quilt/0.63-1 MIME-Version: 1.0 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 3.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jan Kara 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 CC: Sage Weil CC: ceph-devel@vger.kernel.org Coverity-id: 1226882 Signed-off-by: Jan Kara Signed-off-by: Ilya Dryomov Signed-off-by: Greg Kroah-Hartman --- drivers/block/rbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3227,7 +3227,7 @@ static int rbd_obj_read_sync(struct rbd_ 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,