diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-15 13:52:37 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-15 13:52:37 -0700 |
| commit | 16e91cce26f92282b103d04adc5f0035066a1696 (patch) | |
| tree | b72b33514d77acd22f215e75854813614d34bf26 | |
| parent | 7b2f414b87f515b63a0821f6601aea4b8b005691 (diff) | |
| download | lwn-16e91cce26f92282b103d04adc5f0035066a1696.tar.gz lwn-16e91cce26f92282b103d04adc5f0035066a1696.zip | |
Revert "net: fix rds_iovec page count overflow"
This reverts commit b291661643c93044e6d4a228d3268649ccf30a0c (originally
commit 1b1f693d7ad6d193862dcb1118540a030c5e761f upstream).
I messed it up in backporting it to the .33-stable kernel, so revert it
for now and try it again the next review cycle.
Cc: Thomas Pollet <thomas.pollet@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andy Grover <andy.grover@oracle.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/rds/rdma.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/rds/rdma.c b/net/rds/rdma.c index 4810a25a53c7..1fa0f4b9fac3 100644 --- a/net/rds/rdma.c +++ b/net/rds/rdma.c @@ -497,14 +497,6 @@ static struct rds_rdma_op *rds_rdma_prepare(struct rds_sock *rs, max_pages = max(nr, max_pages); nr_pages += nr; - - /* - * nr_pages for one entry is limited to (UINT_MAX>>PAGE_SHIFT)+1, - * so tot_pages cannot overflow without first going negative. - */ - if ((int)nr_pages < 0) - ret = -EINVAL; - goto out; } pages = kcalloc(max_pages, sizeof(struct page *), GFP_KERNEL); |