From: Andy Grover <andy.grover@oracle.com>
Date: Thu, 28 Oct 2010 15:40:56 +0000 (+0000)
Subject: RDS: Return -EINVAL if rds_rdma_pages returns an error
X-Git-Tag: v2.6.37-rc1~11^2~7
X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=a09f69c49b84b161ebd4dd09d3cce1b68297f1d3

RDS: Return -EINVAL if rds_rdma_pages returns an error

rds_cmsg_rdma_args would still return success even if rds_rdma_pages
returned an error (or overflowed).

Signed-off-by: Andy Grover <andy.grover@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/rds/rdma.c b/net/rds/rdma.c
index 0df02c8a853..d0ba2ca3b71 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) {