From: Alex Elder <elder@inktank.com>
To: "ceph-devel@vger.kernel.org" <ceph-devel@vger.kernel.org>
Subject: [PATCH 3/5] rbd: prevent bytes transferred overflow
Date: Fri, 08 Feb 2013 10:32:53 -0600 [thread overview]
Message-ID: <511528B5.5090607@inktank.com> (raw)
In-Reply-To: <51152847.2030305@inktank.com>
In rbd_obj_read_sync(), verify the number of bytes transferred won't
exceed what can be represented by a size_t before using it to
indicate the number of bytes to copy to the result buffer.
(The real motivation for this is to prepare for the next patch.)
Signed-off-by: Alex Elder <elder@inktank.com>
---
drivers/block/rbd.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 37361bd..99f1a29 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -2048,6 +2048,7 @@ static int rbd_obj_read_sync(struct rbd_device
*rbd_dev,
struct ceph_osd_client *osdc;
struct page **pages = NULL;
u32 page_count;
+ size_t size;
int ret;
page_count = (u32) calc_pages_for(offset, length);
@@ -2084,7 +2085,10 @@ static int rbd_obj_read_sync(struct rbd_device
*rbd_dev,
ret = obj_request->result;
if (ret < 0)
goto out;
- ret = ceph_copy_from_page_vector(pages, buf, 0, obj_request->xferred);
+
+ rbd_assert(obj_request->xferred <= (u64) SIZE_MAX);
+ size = (size_t) obj_request->xferred;
+ ret = ceph_copy_from_page_vector(pages, buf, 0, size);
if (version)
*version = obj_request->version;
out:
--
1.7.9.5
next prev parent reply other threads:[~2013-02-08 16:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-08 16:31 [PATCH 0/5] ceph: cleanup ceph page vector functions Alex Elder
2013-02-08 16:32 ` [PATCH 1/5] ceph: remove a few bogus declarations Alex Elder
2013-02-08 16:32 ` [PATCH 2/5] libceph: use void pointers in page vector functions Alex Elder
2013-02-08 16:32 ` Alex Elder [this message]
2013-02-08 16:33 ` [PATCH 4/5] rbd: ignore result of ceph_copy_from_page_vector() Alex Elder
2013-02-08 16:33 ` [PATCH 5/5] libceph: drop return value from page vector copy routines Alex Elder
2013-02-19 19:15 ` [PATCH 0/5] ceph: cleanup ceph page vector functions Josh Durgin
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=511528B5.5090607@inktank.com \
--to=elder@inktank.com \
--cc=ceph-devel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.