libceph: use the right footer size when skipping a message
ceph_msg_footer is 21 bytes long, while ceph_msg_footer_old is only 13. Don't skip too much when CEPH_FEATURE_MSG_AUTH isn't negotiated. Cc: stable@vger.kernel.org # 3.19+ Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Reviewed-by: Alex Elder <elder@linaro.org>
This commit is contained in:
parent
e7a88e82fe
commit
dbc0d3caff
|
@ -1197,6 +1197,13 @@ static bool ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor,
|
|||
return new_piece;
|
||||
}
|
||||
|
||||
static size_t sizeof_footer(struct ceph_connection *con)
|
||||
{
|
||||
return (con->peer_features & CEPH_FEATURE_MSG_AUTH) ?
|
||||
sizeof(struct ceph_msg_footer) :
|
||||
sizeof(struct ceph_msg_footer_old);
|
||||
}
|
||||
|
||||
static void prepare_message_data(struct ceph_msg *msg, u32 data_len)
|
||||
{
|
||||
BUG_ON(!msg);
|
||||
|
@ -2335,7 +2342,7 @@ static int read_partial_message(struct ceph_connection *con)
|
|||
ceph_pr_addr(&con->peer_addr.in_addr),
|
||||
seq, con->in_seq + 1);
|
||||
con->in_base_pos = -front_len - middle_len - data_len -
|
||||
sizeof(m->footer);
|
||||
sizeof_footer(con);
|
||||
con->in_tag = CEPH_MSGR_TAG_READY;
|
||||
return 1;
|
||||
} else if ((s64)seq - (s64)con->in_seq > 1) {
|
||||
|
@ -2360,7 +2367,7 @@ static int read_partial_message(struct ceph_connection *con)
|
|||
/* skip this message */
|
||||
dout("alloc_msg said skip message\n");
|
||||
con->in_base_pos = -front_len - middle_len - data_len -
|
||||
sizeof(m->footer);
|
||||
sizeof_footer(con);
|
||||
con->in_tag = CEPH_MSGR_TAG_READY;
|
||||
con->in_seq++;
|
||||
return 1;
|
||||
|
|
Loading…
Reference in a new issue