lkml.org 
[lkml]   [2014]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 111/129] rbd: fix buffer size for writes to images with snapshots
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Josh Durgin <josh.durgin@inktank.com>

    commit 03507db631c94a48e316c7f638ffb2991544d617 upstream.

    rbd_osd_req_create() needs to know the snapshot context size to create
    a buffer large enough to send it with the message front. It gets this
    from the img_request, which was not set for the obj_request yet. This
    resulted in trying to write past the end of the front payload, hitting
    this BUG:

    libceph: BUG_ON(p > msg->front.iov_base + msg->front.iov_len);

    Fix this by associating the obj_request with its img_request
    immediately after it's created, before the osd request is created.

    Fixes: http://tracker.ceph.com/issues/5760
    Suggested-by: Alex Elder <alex.elder@linaro.org>
    Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
    Reviewed-by: Alex Elder <alex.elder@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/block/rbd.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/drivers/block/rbd.c
    +++ b/drivers/block/rbd.c
    @@ -2213,6 +2213,11 @@ static int rbd_img_request_fill(struct r
    rbd_segment_name_free(object_name);
    if (!obj_request)
    goto out_unwind;
    + /*
    + * set obj_request->img_request before creating the
    + * osd_request so that it gets the right snapc
    + */
    + rbd_img_obj_request_add(img_request, obj_request);

    if (type == OBJ_REQUEST_BIO) {
    unsigned int clone_size;
    @@ -2254,11 +2259,6 @@ static int rbd_img_request_fill(struct r
    obj_request->pages, length,
    offset & ~PAGE_MASK, false, false);

    - /*
    - * set obj_request->img_request before formatting
    - * the osd_request so that it gets the right snapc
    - */
    - rbd_img_obj_request_add(img_request, obj_request);
    if (write_request)
    rbd_osd_req_format_write(obj_request);
    else



    \
     
     \ /
      Last update: 2014-01-07 02:41    [W:4.145 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site