diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index adb4b32a9d51..4146f0710e6a 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -226,7 +226,7 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size)
 
 		if (!buffer || (name_len + 1) > size_left) {
 			ret = -ERANGE;
-			break;
+			goto err;
 		}
 
 		name_ptr = (unsigned long)(di + 1);