diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2024-06-10 22:01:40 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2024-06-10 22:01:40 +0200 |
commit | 5968125f55a3a3f3394e4ebe45e1f96d4864c576 (patch) | |
tree | 65b6008d0919c6fa7a0805c4a9b3ea6e6cbf7f85 /hurd | |
parent | ed06248019908dd4f286552594ac3ec844ef3da4 (diff) | |
download | glibc-5968125f55a3a3f3394e4ebe45e1f96d4864c576.zip glibc-5968125f55a3a3f3394e4ebe45e1f96d4864c576.tar.gz glibc-5968125f55a3a3f3394e4ebe45e1f96d4864c576.tar.bz2 |
hurd: Fix getxattr/listxattr returning ERANGE
The manpage says that when the passed size is zero, they should set the
expected size and return 0. ERANGE shall be returned only when the non-zero
passed size is not large enough.
Diffstat (limited to 'hurd')
-rw-r--r-- | hurd/xattr.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/hurd/xattr.c b/hurd/xattr.c index 1a84c90..2d83edf 100644 --- a/hurd/xattr.c +++ b/hurd/xattr.c @@ -50,7 +50,15 @@ _hurd_xattr_get (io_t port, const char *name, void *value, size_t *size) else if (value) { if (*size < sizeof st.st_author) - return ERANGE; + { + if (*size > 0) + return ERANGE; + else + { + *size = sizeof st.st_author; + return 0; + } + } memcpy (value, &st.st_author, sizeof st.st_author); } *size = sizeof st.st_author; @@ -73,12 +81,21 @@ _hurd_xattr_get (io_t port, const char *name, void *value, size_t *size) err = __file_get_translator (port, &buf, &bufsz); if (err) return err; - if (value != NULL && *size < bufsz) + + if (*size < bufsz) { if (buf != value) __munmap (buf, bufsz); - return ERANGE; + + if (*size > 0) + return ERANGE; + else + { + *size = bufsz; + return 0; + } } + if (buf != value && bufsz > 0) { if (value != NULL) @@ -201,7 +218,7 @@ _hurd_xattr_list (io_t port, void *buffer, size_t *size) if (st.st_mode & S_IPTRANS) add ("gnu.translator"); - if (buffer != NULL && total > *size) + if (*size > 0 && total > *size) return ERANGE; *size = total; return 0; |