1 files changed, 7 insertions, 9 deletions

diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index 66b26fdfff8d..e5ddb4e5ea94 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -756,7 +756,8 @@ find_xattr_handler_prefix(const struct xattr_handler **handlers,
                 return NULL;
 
         for_each_xattr_handler(handlers, xah) {
-                if (strncmp(xah->prefix, name, strlen(xah->prefix)) == 0)
+                const char *prefix = xattr_prefix(xah);
+                if (strncmp(prefix, name, strlen(prefix)) == 0)
                         break;
         }
 
@@ -839,19 +840,16 @@ static int listxattr_filler(struct dir_context *ctx, const char *name,
 
                 handler = find_xattr_handler_prefix(b->dentry->d_sb->s_xattr,
                                                     name);
-                if (!handler)   /* Unsupported xattr name */
+                if (!handler /* Unsupported xattr name */ ||
+                    (handler->list && !handler->list(b->dentry)))
                         return 0;
+                size = namelen + 1;
                 if (b->buf) {
-                        size = handler->list(handler, b->dentry,
-                                             b->buf + b->pos, b->size, name,
-                                             namelen);
                         if (size > b->size)
                                 return -ERANGE;
-                } else {
-                        size = handler->list(handler, b->dentry,
-                                             NULL, 0, name, namelen);
+                        memcpy(b->buf + b->pos, name, namelen);
+                        b->buf[b->pos + namelen] = 0;
                 }
-
                 b->pos += size;
         }
         return 0;