lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rbd: prevent bytes transferred overflow

Browse Source 
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>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder
2013-02-06 13:11:38 -06:00
parent b324814e84
commit 1ceae7ef0f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/block/rbd.c
View File

@@ -2048,6 +2048,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,
struct ceph_osd_client *osdc; struct ceph_osd_client *osdc;
struct page **pages = NULL; struct page **pages = NULL;
u32 page_count; u32 page_count;
size_t size;
int ret; int ret;
page_count = (u32) calc_pages_for(offset, length); 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; ret = obj_request->result;
if (ret < 0) if (ret < 0)
goto out; 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) if (version)
*version = obj_request->version; *version = obj_request->version;
out: out: