Attachment 10798 Details for Bug 10689 – fix calculation of acl_len in struct gpfs_acl

[patch] fix calculation of acl_len in struct gpfs_acl

samba-3.6.25-gpfs_putacl.patch (text/plain), 1.07 KB, created by Rolf Anders on 2015-02-26 19:20:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rolf Anders

Created: 2015-02-26 19:20:05 UTC

Size: 1.07 KB

patch

obsolete

>--- samba-3.6.25.orig/source3/modules/vfs_gpfs.c	2015-02-22 15:11:32.000000000 +0100
>+++ samba-3.6.25/source3/modules/vfs_gpfs.c	2015-02-26 19:09:47.000000000 +0100
>@@ -390,8 +390,8 @@
> 	struct gpfs_acl *gacl;
> 	TALLOC_CTX *mem_ctx  = talloc_tos();
> 
>-	gacl_len = sizeof(struct gpfs_acl) +
>-		(smb_get_naces(smbacl)-1)*sizeof(gpfs_ace_v4_t);
>+	gacl_len = offsetof(gpfs_acl_t, ace_v4) + smb_get_naces(smbacl) *
>+		sizeof(gpfs_ace_v4_t);
> 
> 	gacl = (struct gpfs_acl *)TALLOC_SIZE(mem_ctx, gacl_len);
> 	if (gacl == NULL) {
>@@ -650,16 +650,11 @@
> 	gpfs_aclLen_t len;
> 	struct gpfs_acl *result;
> 	int i;
>-	union gpfs_ace_union
>-	{
>-		gpfs_ace_v1_t  ace_v1[1]; /* when GPFS_ACL_VERSION_POSIX */
>-		gpfs_ace_v4_t  ace_v4[1]; /* when GPFS_ACL_VERSION_NFS4  */
>-	};
> 
> 	DEBUG(10, ("smb2gpfs_acl: Got ACL with %d entries\n", pacl->count));
> 
>-	len = sizeof(struct gpfs_acl) - sizeof(union gpfs_ace_union) +
>-		(pacl->count)*sizeof(gpfs_ace_v1_t);
>+	len = offsetof(gpfs_acl_t, ace_v1) + (pacl->count) *
>+		sizeof(gpfs_ace_v1_t);
> 
> 	result = (struct gpfs_acl *)SMB_MALLOC(len);
> 	if (result == NULL) {

Actions: View

Attachments on bug 10689: 10069 | 10798