xattr handlers: plug a lock leak in simple_xattr_list

The code could leak xattrs->lock on error. Problem introduced with 786534b "tmpfs: listxattr should include POSIX ACL xattrs". Signed-off-by: Mateusz Guzik <[email protected]> Signed-off-by: Al Viro <[email protected]>
kyagi · Feb 20, 2016 · 0e9a7da · 0e9a7da
1 parent 2feb55f
commit 0e9a7da
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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;
 }
 
 /*