diff options
author | Eryu Guan <guaneryu@gmail.com> | 2016-10-24 08:46:40 -0400 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2016-11-29 00:08:53 -0500 |
commit | ae9ebe7c4ee0c16c3d55d1ae3096c82e0a7c136f (patch) | |
tree | 511bdfb5bd8c8477a7d1b82941f2bf0c4169330e /fs | |
parent | b8c600120fc87d53642476f48c8055b38d6e14c7 (diff) |
CIFS: iterate over posix acl xattr entry correctly in ACL_to_cifs_posix()
Commit 2211d5ba5c6c ("posix_acl: xattr representation cleanups")
removes the typedefs and the zero-length a_entries array in struct
posix_acl_xattr_header, and uses bare struct posix_acl_xattr_header
and struct posix_acl_xattr_entry directly.
But it failed to iterate over posix acl slots when converting posix
acls to CIFS format, which results in several test failures in
xfstests (generic/053 generic/105) when testing against a samba v1
server, starting from v4.9-rc1 kernel. e.g.
[root@localhost xfstests]# diff -u tests/generic/105.out /root/xfstests/results//generic/105.out.bad
--- tests/generic/105.out 2016-09-19 16:33:28.577962575 +0800
+++ /root/xfstests/results//generic/105.out.bad 2016-10-22 15:41:15.201931110 +0800
@@ -1,3 +1,4 @@
QA output created by 105
-rw-r--r-- root
+setfacl: subdir: Invalid argument
-rw-r--r-- root
Fix it by introducing a new "ace" var, like what
cifs_copy_posix_acl() does, and iterating posix acl xattr entries
over it in the for loop.
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/cifssmb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 3f3185febc58..e3fed9249a04 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
@@ -3427,6 +3427,7 @@ static __u16 ACL_to_cifs_posix(char *parm_data, const char *pACL, | |||
3427 | __u16 rc = 0; | 3427 | __u16 rc = 0; |
3428 | struct cifs_posix_acl *cifs_acl = (struct cifs_posix_acl *)parm_data; | 3428 | struct cifs_posix_acl *cifs_acl = (struct cifs_posix_acl *)parm_data; |
3429 | struct posix_acl_xattr_header *local_acl = (void *)pACL; | 3429 | struct posix_acl_xattr_header *local_acl = (void *)pACL; |
3430 | struct posix_acl_xattr_entry *ace = (void *)(local_acl + 1); | ||
3430 | int count; | 3431 | int count; |
3431 | int i; | 3432 | int i; |
3432 | 3433 | ||
@@ -3453,8 +3454,7 @@ static __u16 ACL_to_cifs_posix(char *parm_data, const char *pACL, | |||
3453 | return 0; | 3454 | return 0; |
3454 | } | 3455 | } |
3455 | for (i = 0; i < count; i++) { | 3456 | for (i = 0; i < count; i++) { |
3456 | rc = convert_ace_to_cifs_ace(&cifs_acl->ace_array[i], | 3457 | rc = convert_ace_to_cifs_ace(&cifs_acl->ace_array[i], &ace[i]); |
3457 | (struct posix_acl_xattr_entry *)(local_acl + 1)); | ||
3458 | if (rc != 0) { | 3458 | if (rc != 0) { |
3459 | /* ACE not converted */ | 3459 | /* ACE not converted */ |
3460 | break; | 3460 | break; |