diff mbox

xattr handlers: plug a lock leak in simple_xattr_list

Message ID 1454572457-1520-1-git-send-email-agruenba@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Andreas Gruenbacher Feb. 4, 2016, 7:54 a.m. UTC 
From: Mateusz Guzik <mguzik@redhat.com>

The code could leak xattrs->lock on error.

Problem introduced with 786534b92f3ce68f4 "tmpfs: listxattr should
include POSIX ACL xattrs".

Signed-off-by: Mateusz Guzik <mguzik@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Cc: <stable@vger.kernel.org> # 4.4

---
 fs/xattr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

James Morris Feb. 7, 2016, 10:53 p.m. UTC | #1 
On Thu, 4 Feb 2016, Andreas Gruenbacher wrote:

> From: Mateusz Guzik <mguzik@redhat.com>
> 
> The code could leak xattrs->lock on error.
> 
> Problem introduced with 786534b92f3ce68f4 "tmpfs: listxattr should
> include POSIX ACL xattrs".
> 
> Signed-off-by: Mateusz Guzik <mguzik@redhat.com>
> Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
> Cc: <stable@vger.kernel.org> # 4.4


Acked-by: James Morris <james.l.morris@oracle.com>
diff mbox

Patch

diff --git a/fs/xattr.c b/fs/xattr.c
index 07d0e47..4861322 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -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;
 }
 
 /*