| From | Willy Tarreau <> | Subject | [PATCH 3.10 164/319] ubifs: Fix xattr_names length in exit paths | Date | Sun, 5 Feb 2017 20:19:46 +0100 |
| |
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: Willy Tarreau <w@1wt.eu> --- fs/ubifs/xattr.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c index 0f7139b..69a42f3 100644 --- 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); -- 2.8.0.rc2.1.gbe9624a
|