netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andy Grover <andy.grover@oracle.com>
To: netdev@vger.kernel.org
Cc: rds-devel@oss.oracle.com, Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 1/5] net: fix rds_iovec page count overflow
Date: Thu, 28 Oct 2010 18:40:55 -0700	[thread overview]
Message-ID: <1288316459-4679-2-git-send-email-andy.grover@oracle.com> (raw)
In-Reply-To: <1288316459-4679-1-git-send-email-andy.grover@oracle.com>

From: Linus Torvalds <torvalds@linux-foundation.org>

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>
---
 net/rds/rdma.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/net/rds/rdma.c b/net/rds/rdma.c
index 1a41deb..0df02c8 100644
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -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;
-- 
1.7.1


  reply	other threads:[~2010-10-29  1:42 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-29  1:40 [PATCH 0/5] RDS rds_iovec fixes Andy Grover
2010-10-29  1:40 ` Andy Grover [this message]
2010-10-29  1:40 ` [PATCH 2/5] RDS: Return -EINVAL if rds_rdma_pages returns an error Andy Grover
2010-10-29  1:40 ` [PATCH 3/5] RDS: Clean up error handling in rds_cmsg_rdma_args Andy Grover
2010-10-29  1:40 ` [PATCH 4/5] RDS: Copy rds_iovecs into kernel memory instead of rereading from userspace Andy Grover
2010-10-29  1:40 ` [PATCH 5/5] RDS: Let rds_message_alloc_sgs() return NULL Andy Grover
2010-10-30 23:34 ` [PATCH 0/5] RDS rds_iovec fixes David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1288316459-4679-2-git-send-email-andy.grover@oracle.com \
    --to=andy.grover@oracle.com \
    --cc=netdev@vger.kernel.org \
    --cc=rds-devel@oss.oracle.com \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).