lkml.org 
[lkml]   [2016]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 140/196] libceph: use the right footer size when skipping a message
    Date
    3.19.8-ckt16 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Ilya Dryomov <idryomov@gmail.com>

    commit dbc0d3caff5b7591e0cf8e34ca686ca6f4479ee1 upstream.

    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.

    Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
    Reviewed-by: Alex Elder <elder@linaro.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    net/ceph/messenger.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
    index e1b9ca1..3e64c03 100644
    --- a/net/ceph/messenger.c
    +++ b/net/ceph/messenger.c
    @@ -1170,6 +1170,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);
    @@ -2296,7 +2303,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) {
    @@ -2328,7 +2335,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;
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-09 02:41    [W:4.198 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site