os/ObjectStore: fix get_data_alignment return -1 causing problem in msg header #18475
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…sg header sizeof(data_off) in ceph_msg_header is uint16_t, so -1 will be 65535. When peer side receive MOSDRepOp message, it will allocate extra 1 byte buffer to store nonexisted buffer. Signed-off-by: Haomai Wang <haomai@xsky.com>
liu-chunmei
reviewed
Oct 23, 2017
| @@ -853,7 +853,7 @@ class ObjectStore { | |||
| /// offset of buffer as aligned to destination within object. | |||
| int get_data_alignment() { | |||
| if (!data.largest_data_len) | |||
| return -1; | |||
| return 0; | |||
| return (0 - get_data_offset()) & ~CEPH_PAGE_MASK; | |||
There was a problem hiding this comment.
the next line 857 0 - get_data_offset() is also negative, right?
There was a problem hiding this comment.
no, it should be ok, because (& ~CEPH_PAGE_MASK) will get a right value
amitkumar50
approved these changes
Oct 24, 2017
|
ready for merge |
liewegas
approved these changes
Oct 24, 2017
|
backport to luminous? |
|
I think extra 1 byte bufferptr doesn't make so bad effect? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
sizeof(data_off) in ceph_msg_header is uint16_t, so -1 will be 65535. When peer
side receive MOSDRepOp message, it will allocate extra 1 byte buffer to store
nonexisted buffer.
Signed-off-by: Haomai Wang haomai@xsky.com