Commit dcef84f1 authored by Linus Torvalds's avatar Linus Torvalds Committed by Greg Kroah-Hartman

net: fix rds_iovec page count overflow

commit 1b1f693d upstream.

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: default avatarThomas Pollet <thomas.pollet@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarAndy Grover <andy.grover@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
[v2: nr is unsigned in the old code]
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Acked-by: default avatarTim Gardner <tim.gardner@canonical.com>
Acked-by: default avatarBrad Figg <brad.figg@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c4f6afb9
...@@ -473,6 +473,17 @@ static struct rds_rdma_op *rds_rdma_prepare(struct rds_sock *rs, ...@@ -473,6 +473,17 @@ static struct rds_rdma_op *rds_rdma_prepare(struct rds_sock *rs,
max_pages = max(nr, max_pages); max_pages = max(nr, max_pages);
nr_pages += nr; nr_pages += nr;
/*
* nr for one entry in limited to (UINT_MAX>>PAGE_SHIFT)+1
* so nr_pages cannot overflow without becoming bigger than
* INT_MAX first. If nr cannot overflow then max_pages should
* be ok.
*/
if (nr_pages > INT_MAX) {
ret = -EINVAL;
goto out;
}
} }
pages = kcalloc(max_pages, sizeof(struct page *), GFP_KERNEL); pages = kcalloc(max_pages, sizeof(struct page *), GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment