[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  b68b7d51681 vfs: Fix CID 1455914 Unused value
       via  55b0011aaf6 smbd: Fix CID 1455912 Logically dead code
       via  b9e74928ab9 winbind: Fix CID 1455915 Resource leak
       via  51f16ec5789 librpc: Fix CID 1455913 Use after free
      from  d2b5aa16500 whatsnew: announce removal of DES encryption type in Kerberos

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


- Log -----------------------------------------------------------------
commit b68b7d51681955d925b746173ad45f4319171522
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 19 14:29:52 2019 +0100

    vfs: Fix CID 1455914 Unused value
    
    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): Tue Nov 19 17:37:42 UTC 2019 on sn-devel-184

commit 55b0011aaf6b9c46bece711089d89bb1a6317cfa
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 19 14:23:52 2019 +0100

    smbd: Fix CID 1455912 Logically dead code
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit b9e74928ab99a169c76dcd3b401da70cbd1b3985
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 19 14:20:14 2019 +0100

    winbind: Fix CID 1455915 Resource leak
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 51f16ec578987506a2ea07401b287b731c08c3a1
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 19 14:17:38 2019 +0100

    librpc: Fix CID 1455913 Use after free
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 librpc/rpc/dcerpc_util.c          | 3 ++-
 source3/modules/vfs_glusterfs.c   | 4 ++++
 source3/smbd/oplock.c             | 4 ++--
 source3/winbindd/winbindd_cache.c | 3 +++
 4 files changed, 11 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/rpc/dcerpc_util.c b/librpc/rpc/dcerpc_util.c
index 1fb3fa72075..32df534d5d9 100644
--- a/librpc/rpc/dcerpc_util.c
+++ b/librpc/rpc/dcerpc_util.c
@@ -1434,10 +1434,11 @@ void dcerpc_log_packet(const char *lockdir,
 		}
 
 		saved = file_save(name, pkt->data, pkt->length);
-		free(name);
 		if (saved) {
 			DBG_DEBUG("Logged rpc packet to %s\n", name);
+			free(name);
 			break;
 		}
+		free(name);
 	}
 }
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index 6d087c0b4d4..a28b48dae45 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -1495,6 +1495,10 @@ static int vfs_gluster_fallocate(struct vfs_handle_struct *handle,
 
 	if (punch_hole) {
 		ret = glfs_discard(glfd, offset, len);
+		if (ret != 0) {
+			DBG_DEBUG("glfs_discard failed: %s\n",
+				  strerror(errno));
+		}
 	}
 
 	ret = glfs_fallocate(glfd, keep_size, offset, len);
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index ad993cc95b0..6a3b1f77688 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -1032,7 +1032,7 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx,
 		return;
 	}
 
-	if ((break_from == SMB2_LEASE_NONE) && !break_needed) {
+	if (break_from == SMB2_LEASE_NONE) {
 		struct file_id_buf idbuf;
 		DBG_NOTICE("Already downgraded oplock to none on %s: %s\n",
 			   file_id_str_buf(fsp->file_id, &idbuf),
@@ -1043,7 +1043,7 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx,
 	DEBUG(10, ("break_from=%u, break_to=%u\n",
 		   (unsigned)break_from, (unsigned)break_to));
 
-	if ((break_from == break_to) && !break_needed) {
+	if (break_from == break_to) {
 		struct file_id_buf idbuf;
 		DBG_NOTICE("Already downgraded oplock to %u on %s: %s\n",
 			   (unsigned)break_to,
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 3e7afdaa546..9122e2bc5d6 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -1392,17 +1392,20 @@ NTSTATUS wcache_save_creds(struct winbindd_domain *domain,
 
 	rc = gnutls_hash_init(&hash_hnd, GNUTLS_DIG_MD5);
 	if (rc < 0) {
+		centry_free(centry);
 		return gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
 	}
 
 	rc = gnutls_hash(hash_hnd, cred_salt, 16);
 	if (rc < 0) {
 		gnutls_hash_deinit(hash_hnd, NULL);
+		centry_free(centry);
 		return gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
 	}
 	rc = gnutls_hash(hash_hnd, nt_pass, 16);
 	if (rc < 0) {
 		gnutls_hash_deinit(hash_hnd, NULL);
+		centry_free(centry);
 		return gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
 	}
 	gnutls_hash_deinit(hash_hnd, salted_hash);


-- 
Samba Shared Repository