This is a note to let you know that I've just added the patch titled
net: fix rds_iovec page count overflow
to the 2.6.32-longterm tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.32.git;a=summary
The filename of the patch is:
net-fix-rds_iovec-page-count-overflow.patch
and it can be found in the queue-2.6.32 subdirectory.
If you, or anyone else, feels it should not be added to the 2.6.32 longterm
tree,
please let <[email protected]> know about it.
>From 1b1f693d7ad6d193862dcb1118540a030c5e761f Mon Sep 17 00:00:00 2001
From: Linus Torvalds <[email protected]>
Date: Thu, 28 Oct 2010 15:40:55 +0000
Subject: net: fix rds_iovec page count overflow
From: Linus Torvalds <[email protected]>
commit 1b1f693d7ad6d193862dcb1118540a030c5e761f 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: Thomas Pollet <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Andy Grover <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/rds/rdma.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -473,6 +473,14 @@ static struct rds_rdma_op *rds_rdma_prep
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);
Patches currently in longterm-queue-2.6.32 which might be from
[email protected] are
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/net-fix-rds_iovec-page-count-overflow.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/mm-avoid-wrapping-vm_pgoff-in-mremap.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/drivers-rtc-rtc-ds1511.c-world-writable-sysfs-nvram-file.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/char-tpm-fix-unitialized-usage-of-data-buffer.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/drivers-misc-ep93xx_pwm.c-world-writable-sysfs-files.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/exec-make-argv-envp-memory-visible-to-oom-killer.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/relax-si_code-check-in-rt_sigqueueinfo-and-rt_tgsigqueueinfo.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/exec-copy-and-paste-the-fixes-into-compat_do_execve-paths.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
