From patchwork Fri Oct 29 01:40:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Grover X-Patchwork-Id: 69539 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C54CDB70DF for ; Fri, 29 Oct 2010 12:42:07 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759106Ab0J2BmB (ORCPT ); Thu, 28 Oct 2010 21:42:01 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:43943 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757270Ab0J2Bl5 (ORCPT ); Thu, 28 Oct 2010 21:41:57 -0400 Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id o9T1ftHs030896 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 29 Oct 2010 01:41:57 GMT Received: from acsmt353.oracle.com (acsmt353.oracle.com [141.146.40.153]) by acsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o9SKil18014158; Fri, 29 Oct 2010 01:41:55 GMT Received: from abhmt012.oracle.com by acsmt353.oracle.com with ESMTP id 732721881288316483; Thu, 28 Oct 2010 18:41:23 -0700 Received: from lute.us.oracle.com (/139.185.48.5) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 28 Oct 2010 18:41:21 -0700 From: Andy Grover To: netdev@vger.kernel.org Cc: rds-devel@oss.oracle.com Subject: [PATCH 2/5] RDS: Return -EINVAL if rds_rdma_pages returns an error Date: Thu, 28 Oct 2010 18:40:56 -0700 Message-Id: <1288316459-4679-3-git-send-email-andy.grover@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1288316459-4679-1-git-send-email-andy.grover@oracle.com> References: <1288316459-4679-1-git-send-email-andy.grover@oracle.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rds_cmsg_rdma_args would still return success even if rds_rdma_pages returned an error (or overflowed). Signed-off-by: Andy Grover --- net/rds/rdma.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/net/rds/rdma.c b/net/rds/rdma.c index 0df02c8..d0ba2ca 100644 --- a/net/rds/rdma.c +++ b/net/rds/rdma.c @@ -554,8 +554,10 @@ int rds_cmsg_rdma_args(struct rds_sock *rs, struct rds_message *rm, } nr_pages = rds_rdma_pages(args); - if (nr_pages < 0) + if (nr_pages < 0) { + ret = -EINVAL; goto out; + } pages = kcalloc(nr_pages, sizeof(struct page *), GFP_KERNEL); if (!pages) {