libceph: account for alignment in pages cursor
PATCH 1/1 libceph: account for alignment in pages cursor
When a cursor for a page array data message is initialized it needs to determine the initial value for cursor->last_piece. Currently it just checks if length is less than a page, but that's not correct. The data in the first page in the array will be offset by a page offset based on the alignment recorded for the data. (All pages thereafter will be aligned at the base of the page, so there's no need to account for this except for the first page.)
Because this was wrong, there was a case where the length of a piece would be calculated as all of the residual bytes in the message and that plus the page offset could exceed the length of a page.
So fix this case. Make sure the sum won't wrap.
This resolves a third issue described in:
http://tracker.ceph.com/issues/4598
--- net/ceph/messenger.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/ceph/messenger.c +0 -0
@@ -839,9 +839,10 @@ static void ceph_msg_data_pages_cursor_init(struct
ceph_msg_data *data,
page_count = calc_pages_for(data->alignment, (u64)data->length); cursor->page_offset = data->alignment & ~PAGE_MASK; cursor->page_index = 0;
- BUG_ON(page_count > (int) USHRT_MAX);
- cursor->page_count = (unsigned short) page_count;
- cursor->last_piece = length <= PAGE_SIZE;
+ BUG_ON(page_count > (int)USHRT_MAX);
+ cursor->page_count = (unsigned short)page_count;
+ BUG_ON(length > SIZE_MAX - cursor->page_offset);
+ cursor->last_piece = (size_t)cursor->page_offset + length <= PAGE_SIZE;
}
static struct page *ceph_msg_data_pages_next(struct ceph_msg_data *data,
Signature · 1 line
1.7.9.5
Quoted 12 lines · Alex Elder
When a cursor for a page array data message is initialized it needs to determine the initial value for
cursor->last_piece. Currently it just checks if length is less than a page, but that's not correct. The data in the first page in the array will be offset by a page offset based on the alignment recorded for the data. (All pages thereafter will be aligned at the base of the page, so there's no need to account for this except for the first page.)Because this was wrong, there was a case where the length of a piece would be calculated as all of the residual bytes in the message and that plus the page offset could exceed the length of a page.
Quoted 6 lines
So fix this case. Make sure the sum won't wrap.
This resolves a third issue described in:
http://tracker.ceph.com/issues/4598Signed-off-by Alex Elder <[email protected]>
Whoops. Sage has NOT reviewed this (yet). Sorry for the confusion.
-Alex
Quoted 25 lines
Reviewed-by Sage Weil <[email protected]>--- net/ceph/messenger.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)net/ceph/messenger.c +4
-3@@ -839,9 +839,10 @@ static void ceph_msg_data_pages_cursor_init(structceph_msg_data *data, page_count =calc_pages_for (data->alignment, (u64 )data->length); cursor->page_offset = data->alignment & ~PAGE_MASK ; cursor->page_index =0 ; -BUG_ON (page_count > (int )USHRT_MAX ); - cursor->page_count = (unsigned short ) page_count; - cursor->last_piece = length <=PAGE_SIZE ; +BUG_ON (page_count > (int )USHRT_MAX ); + cursor->page_count = (unsigned short )page_count; +BUG_ON (length >SIZE_MAX - cursor->page_offset); + cursor->last_piece = (size_t )cursor->page_offset + length <=PAGE_SIZE ; }static struct page *ceph_msg_data_pages_next(struct
ceph_msg_data*data,
Quoted 15 lines · Alex Elder
Quoted 14 lines · Alex Elder
When a cursor for a page array data message is initialized it needs to determine the initial value for
cursor->last_piece. Currently it just checks if length is less than a page, but that's not correct. The data in the first page in the array will be offset by a page offset based on the alignment recorded for the data. (All pages thereafter will be aligned at the base of the page, so there's no need to account for this except for the first page.)Because this was wrong, there was a case where the length of a piece would be calculated as all of the residual bytes in the message and that plus the page offset could exceed the length of a page.
So fix this case. Make sure the sum won't wrap.
Quoted 7 lines
Quoted 4 lines
This resolves a third issue described in:
http://tracker.ceph.com/issues/4598Signed-off-by Alex Elder <[email protected]>Whoops. Sage has NOT reviewed this (yet). Sorry for the confusion.
I have now! Looks good. :)
Quoted 34 lines
-Alex
Quoted 23 lines
Reviewed-by Sage Weil <[email protected]>--- net/ceph/messenger.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)net/ceph/messenger.c +4
-3@@ -839,9 +839,10 @@ static void ceph_msg_data_pages_cursor_init(structceph_msg_data *data, page_count =calc_pages_for (data->alignment, (u64 )data->length); cursor->page_offset = data->alignment & ~PAGE_MASK ; cursor->page_index =0 ; -BUG_ON (page_count > (int )USHRT_MAX ); - cursor->page_count = (unsigned short ) page_count; - cursor->last_piece = length <=PAGE_SIZE ; +BUG_ON (page_count > (int )USHRT_MAX ); + cursor->page_count = (unsigned short )page_count; +BUG_ON (length >SIZE_MAX - cursor->page_offset); + cursor->last_piece = (size_t )cursor->page_offset + length <=PAGE_SIZE ; }Quoted 2 lines
static struct page *ceph_msg_data_pages_next(struct
ceph_msg_data*data,--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html