The branch, master has been updated via 7cc9e3fe24d s3/vfs_glusterfs_fuse: Avoid using NAME_MAX directly via e85bb58532f s3/vfs_glusterfs: Avoid using NAME_MAX directly via 01a569bec07 Revert "s3/vfs_glusterfs_fuse: Dynamically determine NAME_MAX" via 1ea533bd5f7 Revert "s3/vfs_glusterfs: Dynamically determine NAME_MAX" from ff4a5f643f4 WHATSNEW.txt: reindex performance, Bind9 logging
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 7cc9e3fe24dd476360837c04538345752048e6be Author: Günther Deschner <g...@samba.org> Date: Mon Jun 3 16:28:36 2019 +0200 s3/vfs_glusterfs_fuse: Avoid using NAME_MAX directly BUG: https://bugzilla.samba.org/show_bug.cgi?id=13872 Guenther Signed-off-by: Guenther Deschner <g...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> Autobuild-User(master): Günther Deschner <g...@samba.org> Autobuild-Date(master): Tue Jun 11 00:29:19 UTC 2019 on sn-devel-184 commit e85bb58532fe82daac6e50e88d08bbab66cb1019 Author: Günther Deschner <g...@samba.org> Date: Mon Jun 3 16:25:46 2019 +0200 s3/vfs_glusterfs: Avoid using NAME_MAX directly BUG: https://bugzilla.samba.org/show_bug.cgi?id=13872 Guenther Signed-off-by: Guenther Deschner <g...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> commit 01a569bec073ce45f412884d340ecfc50ce41fbe Author: Günther Deschner <g...@samba.org> Date: Mon Jun 3 14:27:44 2019 +0200 Revert "s3/vfs_glusterfs_fuse: Dynamically determine NAME_MAX" This reverts commit e28d172b00cadf492c22bd892e2dda3bf2fe2d70. Signed-off-by: Guenther Deschner <g...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> commit 1ea533bd5f7f6febeeb1a4261f2afbb19081e8eb Author: Günther Deschner <g...@samba.org> Date: Mon Jun 3 14:27:18 2019 +0200 Revert "s3/vfs_glusterfs: Dynamically determine NAME_MAX" This reverts commit 8e3a042eb9e502821b147f1bbb2d98d59f17a095. Signed-off-by: Guenther Deschner <g...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/modules/vfs_glusterfs.c | 41 ++++++++++-------------------------- source3/modules/vfs_glusterfs_fuse.c | 34 +++++++----------------------- 2 files changed, 19 insertions(+), 56 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c index 2b5385e44b0..a9415952b4e 100644 --- a/source3/modules/vfs_glusterfs.c +++ b/source3/modules/vfs_glusterfs.c @@ -47,6 +47,7 @@ #include "modules/posixacl_xattr.h" #define DEFAULT_VOLFILE_SERVER "localhost" +#define GLUSTER_NAME_MAX 255 static int read_fd = -1; static int write_fd = -1; @@ -1454,37 +1455,22 @@ 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 = NULL, *val_buf = NULL; - long name_max; - char *found_name = NULL; + char key_buf[GLUSTER_NAME_MAX + 64]; + char val_buf[GLUSTER_NAME_MAX + 1]; - name_max = pathconf(path, _PC_NAME_MAX); - if ((name_max + 1) < 1) { - errno = EINVAL; - return -1; - } - - if (strlen(name) >= name_max) { + if (strlen(name) >= GLUSTER_NAME_MAX) { errno = ENAMETOOLONG; return -1; } - key_buf = talloc_asprintf(mem_ctx, "glusterfs.get_real_filename:%s", - name); - if (key_buf == NULL) { - errno = ENOMEM; - return -1; - } + snprintf(key_buf, GLUSTER_NAME_MAX + 64, + "glusterfs.get_real_filename:%s", name); - 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); + ret = glfs_getxattr(handle->data, path, key_buf, val_buf, + GLUSTER_NAME_MAX + 1); if (ret == -1) { if (errno == ENOATTR) { errno = EOPNOTSUPP; @@ -1492,16 +1478,11 @@ 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 == NULL) { + *found_name = talloc_strdup(mem_ctx, val_buf); + if (found_name[0] == 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 0b1de9fcdb2..d92f5e2b08b 100644 --- a/source3/modules/vfs_glusterfs_fuse.c +++ b/source3/modules/vfs_glusterfs_fuse.c @@ -21,6 +21,8 @@ #include "smbd/smbd.h" #include "system/filesys.h" +#define GLUSTER_NAME_MAX 255 + static int vfs_gluster_fuse_get_real_filename(struct vfs_handle_struct *handle, const char *path, const char *name, @@ -28,35 +30,19 @@ static int vfs_gluster_fuse_get_real_filename(struct vfs_handle_struct *handle, char **_found_name) { int ret; - char *key_buf = NULL, *val_buf = NULL; - long name_max; + char key_buf[GLUSTER_NAME_MAX + 64]; + char val_buf[GLUSTER_NAME_MAX + 1]; char *found_name = NULL; - name_max = pathconf(path, _PC_NAME_MAX); - if ((name_max + 1) < 1) { - errno = EINVAL; - return -1; - } - - if (strlen(name) >= name_max) { + if (strlen(name) >= GLUSTER_NAME_MAX) { errno = ENAMETOOLONG; return -1; } - key_buf = talloc_asprintf(mem_ctx, "glusterfs.get_real_filename:%s", - name); - if (key_buf == NULL) { - errno = ENOMEM; - return -1; - } + snprintf(key_buf, GLUSTER_NAME_MAX + 64, + "glusterfs.get_real_filename:%s", name); - 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, GLUSTER_NAME_MAX + 1); if (ret == -1) { if (errno == ENOATTR) { errno = EOPNOTSUPP; @@ -70,10 +56,6 @@ 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