[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  0872f140c4a torture: Fix the 32-bit build
       via  9b79d5f2a2f s3: VFS: fake_acls: Fix Coverity CID 1435850 Uninitialized pointer read.
      from  c1dd6382e32 ctdb-tests: Make the debug hung script test cope with unreadable stacks

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0872f140c4a354511b25bb5ed937b9e9409ade3a
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 15 15:21:36 2018 +0100

    torture: Fix the 32-bit build
    
    Unfortunately there's no off_t printf specifier as there's one for
    size_t. So we have to use intmax_t.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Thu Nov 15 19:45:24 CET 2018 on sn-devel-144

commit 9b79d5f2a2f8af75ef13bdc41d2dc296e19ba098
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Nov 9 14:13:47 2018 -0800

    s3: VFS: fake_acls: Fix Coverity CID 1435850 Uninitialized pointer read.
    
    map_acl_perms_to_permset() can return an error, check it.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_fake_acls.c | 25 ++++++++++++++++++++-----
 source4/torture/vfs/fruit.c     |  4 ++--
 2 files changed, 22 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_fake_acls.c b/source3/modules/vfs_fake_acls.c
index 616f332e342..ba94c8db06f 100644
--- a/source3/modules/vfs_fake_acls.c
+++ b/source3/modules/vfs_fake_acls.c
@@ -568,7 +568,10 @@ static int fake_acl_process_chmod(SMB_ACL_T *pp_the_acl,
 		}
 		switch (tagtype) {
 			case SMB_ACL_USER_OBJ:
-				map_acl_perms_to_permset(umode, &permset);
+				ret = map_acl_perms_to_permset(umode, &permset);
+				if (ret == -1) {
+					return -1;
+				}
 				break;
 			case SMB_ACL_USER:
 				puid = (uid_t *)sys_acl_get_qualifier(entry);
@@ -578,18 +581,27 @@ static int fake_acl_process_chmod(SMB_ACL_T *pp_the_acl,
 				if (owner != *puid) {
 					break;
 				}
-				map_acl_perms_to_permset(umode, &permset);
+				ret = map_acl_perms_to_permset(umode, &permset);
+				if (ret == -1) {
+					return -1;
+				}
 				break;
 			case SMB_ACL_GROUP_OBJ:
 			case SMB_ACL_GROUP:
 				/* Ignore all group entries. */
 				break;
 			case SMB_ACL_MASK:
-				map_acl_perms_to_permset(mmode, &permset);
+				ret = map_acl_perms_to_permset(mmode, &permset);
+				if (ret == -1) {
+					return -1;
+				}
 				got_mask = true;
 				break;
 			case SMB_ACL_OTHER:
-				map_acl_perms_to_permset(omode, &permset);
+				ret = map_acl_perms_to_permset(omode, &permset);
+				if (ret == -1) {
+					return -1;
+				}
 				break;
 			default:
 				errno = EINVAL;
@@ -614,7 +626,10 @@ static int fake_acl_process_chmod(SMB_ACL_T *pp_the_acl,
 		if (ret == -1) {
 			return -1;
 		}
-		map_acl_perms_to_permset(mmode, &mask_permset);
+		ret = map_acl_perms_to_permset(mmode, &mask_permset);
+		if (ret == -1) {
+			return -1;
+		}
 		ret = sys_acl_set_permset(mask_entry, mask_permset);
 		if (ret == -1) {
 			return -1;
diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
index c532afab729..3b01cf876d0 100644
--- a/source4/torture/vfs/fruit.c
+++ b/source4/torture/vfs/fruit.c
@@ -4727,9 +4727,9 @@ static bool test_writing_afpinfo(struct torture_context *tctx,
 		size_t fi_check_size;
 
 		torture_comment(tctx,
-				"Test %d: offset=%zd size=%zu result=%s\n",
+				"Test %d: offset=%jd size=%zu result=%s\n",
 				i,
-				test_sizes[i].offset,
+				(intmax_t)test_sizes[i].offset,
 				test_sizes[i].size,
 				test_sizes[i].expected_result ? "true":"false");
 


-- 
Samba Shared Repository