Skip to content

Commit

Permalink
Revert "net: fix rds_iovec page count overflow"
Browse files Browse the repository at this point in the history
This reverts commit bd378dd (originally
commit 1b1f693 upstream).

I messed it up in backporting it to the .32-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>
  • Loading branch information
Greg Kroah-Hartman committed Apr 15, 2011
1 parent 2ba8779 commit 4325217
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions net/rds/rdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -473,14 +473,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);
Expand Down

0 comments on commit 4325217

Please sign in to comment.