[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  4d1d6e2 smbd/smb2_ioctl: check for NULL dst_fsp before use
      from  d1dc2b0 ldb-samba: Fix a possible NULL pointer dereference

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


- Log -----------------------------------------------------------------
commit 4d1d6e2d861fdf00bef67ac4d5be5aa781c43787
Author: David Disseldorp via samba-technical <samba-technical at lists.samba.org>
Date:   Tue May 16 14:03:32 2017 +0200

    smbd/smb2_ioctl: check for NULL dst_fsp before use
    
    ...not after. CID #1409040.
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Wed May 17 01:46:52 CEST 2017 on sn-devel-144

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

Summary of changes:
 source3/smbd/smb2_ioctl_filesys.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_ioctl_filesys.c b/source3/smbd/smb2_ioctl_filesys.c
index fbff97c..392372f 100644
--- a/source3/smbd/smb2_ioctl_filesys.c
+++ b/source3/smbd/smb2_ioctl_filesys.c
@@ -186,16 +186,17 @@ static struct tevent_req *fsctl_dup_extents_send(TALLOC_CTX *mem_ctx,
 	if (req == NULL) {
 		return NULL;
 	}
-	*state = (struct fsctl_dup_extents_state) {
-		.conn = dst_fsp->conn,
-		.ev = ev,
-	};
 
 	if (dst_fsp == NULL) {
 		tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
 		return tevent_req_post(req, ev);
 	}
 
+	*state = (struct fsctl_dup_extents_state) {
+		.conn = dst_fsp->conn,
+		.ev = ev,
+	};
+
 	if ((dst_fsp->conn->fs_capabilities
 				& FILE_SUPPORTS_BLOCK_REFCOUNTING) == 0) {
 		DBG_INFO("FS does not advertise block refcounting support\n");


-- 
Samba Shared Repository