lkml.org 
[lkml]   [2017]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 143/306] ubifs: Fix xattr_names length in exit paths
    3.16.40-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Richard Weinberger <richard@nod.at>

    commit 843741c5778398ea67055067f4cc65ae6c80ca0e upstream.

    When the operation fails we also have to undo the changes
    we made to ->xattr_names. Otherwise listxattr() will report
    wrong lengths.

    Signed-off-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    fs/ubifs/xattr.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/fs/ubifs/xattr.c
    +++ b/fs/ubifs/xattr.c
    @@ -167,6 +167,7 @@ out_cancel:
    host_ui->xattr_cnt -= 1;
    host_ui->xattr_size -= CALC_DENT_SIZE(nm->len);
    host_ui->xattr_size -= CALC_XATTR_BYTES(size);
    + host_ui->xattr_names -= nm->len;
    mutex_unlock(&host_ui->ui_mutex);
    out_free:
    make_bad_inode(inode);
    @@ -514,6 +515,7 @@ out_cancel:
    host_ui->xattr_cnt += 1;
    host_ui->xattr_size += CALC_DENT_SIZE(nm->len);
    host_ui->xattr_size += CALC_XATTR_BYTES(ui->data_len);
    + host_ui->xattr_names += nm->len;
    mutex_unlock(&host_ui->ui_mutex);
    ubifs_release_budget(c, &req);
    make_bad_inode(inode);
    \
     
     \ /
      Last update: 2017-02-16 00:38    [W:5.699 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site