Commit 0c5d6cb6 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French

cifs: fix return value for cifs_listxattr

If the application buffer was too small to fit all the names
we would still count the number of bytes and return this for
listxattr. This would then trigger a BUG in usercopy.c

Fix the computation of the size so that we return -ERANGE
correctly when the buffer is too small.

This fixes the kernel BUG for xfstest generic/377
Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Reviewed-by: default avatarAurelien Aptel <aaptel@suse.com>
parent 5f215853
...@@ -747,6 +747,7 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size, ...@@ -747,6 +747,7 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size,
int rc = 0; int rc = 0;
unsigned int ea_name_len = ea_name ? strlen(ea_name) : 0; unsigned int ea_name_len = ea_name ? strlen(ea_name) : 0;
char *name, *value; char *name, *value;
size_t buf_size = dst_size;
size_t name_len, value_len, user_name_len; size_t name_len, value_len, user_name_len;
while (src_size > 0) { while (src_size > 0) {
...@@ -782,9 +783,10 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size, ...@@ -782,9 +783,10 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size,
/* 'user.' plus a terminating null */ /* 'user.' plus a terminating null */
user_name_len = 5 + 1 + name_len; user_name_len = 5 + 1 + name_len;
rc += user_name_len; if (buf_size == 0) {
/* skip copy - calc size only */
if (dst_size >= user_name_len) { rc += user_name_len;
} else if (dst_size >= user_name_len) {
dst_size -= user_name_len; dst_size -= user_name_len;
memcpy(dst, "user.", 5); memcpy(dst, "user.", 5);
dst += 5; dst += 5;
...@@ -792,8 +794,7 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size, ...@@ -792,8 +794,7 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size,
dst += name_len; dst += name_len;
*dst = 0; *dst = 0;
++dst; ++dst;
} else if (dst_size == 0) { rc += user_name_len;
/* skip copy - calc size only */
} else { } else {
/* stop before overrun buffer */ /* stop before overrun buffer */
rc = -ERANGE; rc = -ERANGE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment