diff options
| author | Andy Grover <andy.grover@oracle.com> | 2010-10-28 15:40:56 +0000 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-30 16:34:16 -0700 | 
| commit | a09f69c49b84b161ebd4dd09d3cce1b68297f1d3 (patch) | |
| tree | 295290736f0a4dbbfc495e035adbbe0cafe447e4 | |
| parent | 1b1f693d7ad6d193862dcb1118540a030c5e761f (diff) | |
| download | olio-linux-3.10-a09f69c49b84b161ebd4dd09d3cce1b68297f1d3.tar.xz olio-linux-3.10-a09f69c49b84b161ebd4dd09d3cce1b68297f1d3.zip  | |
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>
| -rw-r--r-- | 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 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) {  |