Skip to content

Commit

Permalink
net: fix rds_iovec page count overflow
Browse files Browse the repository at this point in the history
As reported by Thomas Pollet, the rdma page counting can overflow.  We
get the rdma sizes in 64-bit unsigned entities, but then limit it to
UINT_MAX bytes and shift them down to pages (so with a possible "+1" for
an unaligned address).

So each individual page count fits comfortably in an 'unsigned int' (not
even close to overflowing into signed), but as they are added up, they
might end up resulting in a signed return value. Which would be wrong.

Catch the case of tot_pages turning negative, and return the appropriate
error code.

Reported-by: Thomas Pollet <thomas.pollet@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Andy Grover <andy.grover@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Linus Torvalds authored and David S. Miller committed Oct 30, 2010
1 parent bdfa3d8 commit 1b1f693
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions net/rds/rdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,13 @@ static int rds_rdma_pages(struct rds_rdma_args *args)
return -EINVAL;

tot_pages += nr_pages;

/*
* nr_pages for one entry is limited to (UINT_MAX>>PAGE_SHIFT)+1,
* so tot_pages cannot overflow without first going negative.
*/
if ((int)tot_pages < 0)
return -EINVAL;
}

return tot_pages;
Expand Down

0 comments on commit 1b1f693

Please sign in to comment.