c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 11:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Correctly return ERANGE in getxattr(2)

Browse Source 
According to the getxattr(2) man page the ERANGE errno should be
returned when the size of the value buffer is to small to hold the
result.  Prior to this patch the implementation would just truncate
the value to size bytes.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1408
This commit is contained in:
Brian Behlendorf 2013-04-17 13:07:36 -07:00
parent 254255f735
commit f706421173
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
module/zfs/zpl_xattr.c
View File

@ -225,6 +225,11 @@ zpl_xattr_get_dir(struct inode *ip, const char *name, void *value,
goto out; goto out;
} }
if (size < i_size_read(xip)) {
error = -ERANGE;
goto out;
}
error = zpl_read_common(xip, value, size, 0, UIO_SYSSPACE, 0, cr); error = zpl_read_common(xip, value, size, 0, UIO_SYSSPACE, 0, cr);
out: out:
if (xip) if (xip)
@ -263,9 +268,12 @@ zpl_xattr_get_sa(struct inode *ip, const char *name, void *value, size_t size)
if (!size) if (!size)
return (nv_size); return (nv_size);
memcpy(value, nv_value, MIN(size, nv_size)); if (size < nv_size)
return (-ERANGE);
return (MIN(size, nv_size)); memcpy(value, nv_value, nv_size);
return (nv_size);
} }
static int static int