andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gfapi: zero size issue in glfs_h_acl_set()

Browse Source 
When setting the stringified ACLs in the xattr dict through
pub_glfs_h_setxattrs(), the size of the string is always passed as 0.
The correct way is to pass the length of the ACL in text form.

While verifying this issues, it seems that posix_pacl_set() should
return the errno instead of -1. This helps in debugging, otherwise EPERM
would always be returned on an error.

[ndevos: fix off-by-one strlen() and return errno in posix_pacl_set()]
Change-Id: Ia7a7fa1f3a7d615a813c703057dc97b09a0bbb34
BUG: 789278
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/10782
Tested-by: NetBSD Build System
Tested-by: Gluster Build System <jenkins@build.gluster.com>
This commit is contained in:
Jiffin Tony Thottan 2015-05-14 14:37:25 +05:30 committed by Niels de Vos
parent 8461bf0b50
commit ae9604bbdb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/glfs-handleops.c
View File

@ -1987,7 +1987,6 @@ pub_glfs_h_acl_set (struct glfs *fs, struct glfs_object *object,
int ret = -1;
char *acl_s = NULL;
const char *acl_key = NULL;
ssize_t acl_len = 0;
DECLARE_OLD_THIS;
@ -2007,7 +2006,8 @@ pub_glfs_h_acl_set (struct glfs *fs, struct glfs_object *object,
if (!acl_s)
goto out;
ret = pub_glfs_h_setxattrs (fs, object, acl_key, acl_s, acl_len, 0);
ret = pub_glfs_h_setxattrs (fs, object, acl_key, acl_s,
strlen (acl_s) + 1, 0);
acl_free (acl_s);

4
xlators/storage/posix/src/posix-helpers.c
View File

@ -964,6 +964,10 @@ posix_pacl_set (const char *path, const char *key, const char *acl_s)
acl = acl_from_text (acl_s);
ret = acl_set_file (path, type, acl);
if (ret)
/* posix_handle_pair expects ret to be the errno */
ret = -errno;
acl_free (acl);
return ret;