提交 0e9a7da5 编写于 作者: M Mateusz Guzik 提交者: Al Viro

xattr handlers: plug a lock leak in simple_xattr_list

The code could leak xattrs->lock on error.

Problem introduced with 786534b9 "tmpfs: listxattr should
include POSIX ACL xattrs".
Signed-off-by: NMateusz Guzik <mguzik@redhat.com>
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
上级 2feb55f8
......@@ -940,7 +940,7 @@ ssize_t simple_xattr_list(struct inode *inode, struct simple_xattrs *xattrs,
bool trusted = capable(CAP_SYS_ADMIN);
struct simple_xattr *xattr;
ssize_t remaining_size = size;
int err;
int err = 0;
#ifdef CONFIG_FS_POSIX_ACL
if (inode->i_acl) {
......@@ -965,11 +965,11 @@ ssize_t simple_xattr_list(struct inode *inode, struct simple_xattrs *xattrs,
err = xattr_list_one(&buffer, &remaining_size, xattr->name);
if (err)
return err;
break;
}
spin_unlock(&xattrs->lock);
return size - remaining_size;
return err ? err : size - remaining_size;
}
/*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册