The branch, v4-9-test has been updated via 16462634503 s3/vfs_glusterfs: Dynamically determine NAME_MAX via f6907809a8e s3/vfs_glusterfs_fuse: Dynamically determine NAME_MAX from 571f7034fcc docs/vfs_ceph: describe new ACL behaviour
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-9-test - Log ----------------------------------------------------------------- commit 16462634503e535c3407a51a8287208f1f67e147 Author: Anoop C S <anoo...@redhat.com> Date: Thu Apr 25 16:41:53 2019 +0530 s3/vfs_glusterfs: Dynamically determine NAME_MAX BUG: https://bugzilla.samba.org/show_bug.cgi?id=13872 Signed-off-by: Anoop C S <anoo...@redhat.com> Reviewed-by: Guenther Deschner <g...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> (cherry picked from commit 8e3a042eb9e502821b147f1bbb2d98d59f17a095) Autobuild-User(v4-9-test): Karolin Seeger <ksee...@samba.org> Autobuild-Date(v4-9-test): Tue Apr 30 16:05:51 UTC 2019 on sn-devel-144 commit f6907809a8efa758e22ba3576c6a76dec1bc5ddc Author: Anoop C S <anoo...@redhat.com> Date: Thu Apr 25 16:42:01 2019 +0530 s3/vfs_glusterfs_fuse: Dynamically determine NAME_MAX This allows the vfs_glusterfs_fuse build to complete on AIX. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13872 Signed-off-by: Anoop C S <anoo...@redhat.com> Reviewed-by: Guenther Deschner <g...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> (cherry picked from commit e28d172b00cadf492c22bd892e2dda3bf2fe2d70) ----------------------------------------------------------------------- Summary of changes: source3/modules/vfs_glusterfs.c | 37 ++++++++++++++++++++++++++++-------- source3/modules/vfs_glusterfs_fuse.c | 32 +++++++++++++++++++++++++------ 2 files changed, 55 insertions(+), 14 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c index fc2ea2addeb..e8c88a0abe0 100644 --- a/source3/modules/vfs_glusterfs.c +++ b/source3/modules/vfs_glusterfs.c @@ -1450,20 +1450,36 @@ static int vfs_gluster_chflags(struct vfs_handle_struct *handle, static int vfs_gluster_get_real_filename(struct vfs_handle_struct *handle, const char *path, const char *name, - TALLOC_CTX *mem_ctx, char **found_name) + TALLOC_CTX *mem_ctx, char **_found_name) { int ret; - char key_buf[NAME_MAX + 64]; - char val_buf[NAME_MAX + 1]; + char *key_buf = NULL, *val_buf = NULL; + long name_max; + char *found_name = NULL; - if (strlen(name) >= NAME_MAX) { + name_max = pathconf(path, _PC_NAME_MAX); + if ((name_max + 1) < 1) { + errno = EINVAL; + return -1; + } + + if (strlen(name) >= name_max) { errno = ENAMETOOLONG; return -1; } - snprintf(key_buf, NAME_MAX + 64, - "glusterfs.get_real_filename:%s", name); + key_buf = talloc_asprintf(mem_ctx, "glusterfs.get_real_filename:%s", + name); + if (key_buf == NULL) { + errno = ENOMEM; + return -1; + } + val_buf = talloc_zero_array(mem_ctx, char, name_max + 1); + if (val_buf == NULL) { + errno = ENOMEM; + return -1; + } ret = glfs_getxattr(handle->data, path, key_buf, val_buf, NAME_MAX + 1); if (ret == -1) { if (errno == ENOATTR) { @@ -1472,11 +1488,16 @@ static int vfs_gluster_get_real_filename(struct vfs_handle_struct *handle, return -1; } - *found_name = talloc_strdup(mem_ctx, val_buf); - if (found_name[0] == NULL) { + found_name = talloc_strdup(mem_ctx, val_buf); + if (found_name == NULL) { errno = ENOMEM; return -1; } + *_found_name = found_name; + + TALLOC_FREE(key_buf); + TALLOC_FREE(val_buf); + return 0; } diff --git a/source3/modules/vfs_glusterfs_fuse.c b/source3/modules/vfs_glusterfs_fuse.c index 8855cd18d01..0b1de9fcdb2 100644 --- a/source3/modules/vfs_glusterfs_fuse.c +++ b/source3/modules/vfs_glusterfs_fuse.c @@ -28,19 +28,35 @@ static int vfs_gluster_fuse_get_real_filename(struct vfs_handle_struct *handle, char **_found_name) { int ret; - char key_buf[NAME_MAX + 64]; - char val_buf[NAME_MAX + 1]; + char *key_buf = NULL, *val_buf = NULL; + long name_max; char *found_name = NULL; - if (strlen(name) >= NAME_MAX) { + name_max = pathconf(path, _PC_NAME_MAX); + if ((name_max + 1) < 1) { + errno = EINVAL; + return -1; + } + + if (strlen(name) >= name_max) { errno = ENAMETOOLONG; return -1; } - snprintf(key_buf, NAME_MAX + 64, - "glusterfs.get_real_filename:%s", name); + key_buf = talloc_asprintf(mem_ctx, "glusterfs.get_real_filename:%s", + name); + if (key_buf == NULL) { + errno = ENOMEM; + return -1; + } + + val_buf = talloc_zero_array(mem_ctx, char, name_max + 1); + if (val_buf == NULL) { + errno = ENOMEM; + return -1; + } - ret = getxattr(path, key_buf, val_buf, NAME_MAX + 1); + ret = getxattr(path, key_buf, val_buf, name_max + 1); if (ret == -1) { if (errno == ENOATTR) { errno = EOPNOTSUPP; @@ -54,6 +70,10 @@ static int vfs_gluster_fuse_get_real_filename(struct vfs_handle_struct *handle, return -1; } *_found_name = found_name; + + TALLOC_FREE(key_buf); + TALLOC_FREE(val_buf); + return 0; } -- Samba Shared Repository