[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    RDS: Return -EINVAL if rds_rdma_pages returns an error
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2010-10-31 1:59:10
Message-ID: 201010310159.o9V1xAnt026978 () hera ! kernel ! org
[Download RAW message or body]

Gitweb:     http://git.kernel.org/linus/a09f69c49b84b161ebd4dd09d3cce1b68297f1d3
Commit:     a09f69c49b84b161ebd4dd09d3cce1b68297f1d3
Parent:     1b1f693d7ad6d193862dcb1118540a030c5e761f
Author:     Andy Grover <andy.grover@oracle.com>
AuthorDate: Thu Oct 28 15:40:56 2010 +0000
Committer:  David S. Miller <davem@davemloft.net>
CommitDate: Sat Oct 30 16:34:16 2010 -0700

    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>
---
 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) {
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]