[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  d33c355 CID 1416475: possibly dereferencing NULL in fruit_pread_meta
       via  9715e55 CID 1416476: possibly dereferencing NULL in fruit_ftruncate_rsrc
       via  808b7e2 CID 1416477: possibly dereferencing NULL in fruit_pwrite_meta
       via  c0e4818 CID 1416478: de-ref NULL value in fruit_pwrite_rsrc
      from  15fa8f9 dsdb: Fix CID 1435968 Dereference before null check

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


- Log -----------------------------------------------------------------
commit d33c355103406ceb4941a479f34ea33eae8e87a7
Author: Swen Schillig <swen at vnet.ibm.com>
Date:   Fri May 25 12:45:35 2018 +0200

    CID 1416475: possibly dereferencing NULL in fruit_pread_meta
    
    Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
    Reviewed-by: Christof Schmitt <cs 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 Jun 13 16:29:48 CEST 2018 on sn-devel-144

commit 9715e55e6554c611d858647875d6260c304b5c3a
Author: Swen Schillig <swen at vnet.ibm.com>
Date:   Fri May 25 12:43:42 2018 +0200

    CID 1416476: possibly dereferencing NULL in fruit_ftruncate_rsrc
    
    Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
    Reviewed-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit 808b7e2b0332b4f53597b44e790d0f365cad44c0
Author: Swen Schillig <swen at vnet.ibm.com>
Date:   Fri May 25 11:39:50 2018 +0200

    CID 1416477: possibly dereferencing NULL in fruit_pwrite_meta
    
    Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
    Reviewed-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit c0e4818d68cbc6aea50f0e5a56af29407763bab5
Author: Swen Schillig <swen at vnet.ibm.com>
Date:   Fri May 25 11:32:38 2018 +0200

    CID 1416478: de-ref NULL value in fruit_pwrite_rsrc
    
    Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
    Reviewed-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 source3/modules/vfs_fruit.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index df3cd0c..0784262 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -4002,6 +4002,11 @@ static ssize_t fruit_pread_meta(vfs_handle_struct *handle,
 		return 0;
 	}
 
+	if (fio == NULL) {
+		DBG_ERR("Failed to fetch fsp extension");
+		return -1;
+	}
+
 	/* Yes, macOS always reads from offset 0 */
 	offset = 0;
 	to_return = MIN(n, AFP_INFO_SIZE);
@@ -4328,6 +4333,11 @@ static ssize_t fruit_pwrite_meta(vfs_handle_struct *handle,
 		return -1;
 	}
 
+	if (fio == NULL) {
+		DBG_ERR("Failed to fetch fsp extension");
+		return -1;
+	}
+
 	switch (fio->config->meta) {
 	case FRUIT_META_STREAM:
 		nwritten = fruit_pwrite_meta_stream(handle, fsp, data,
@@ -4405,6 +4415,11 @@ static ssize_t fruit_pwrite_rsrc(vfs_handle_struct *handle,
 	struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
 	ssize_t nwritten;
 
+	if (fio == NULL) {
+		DBG_ERR("Failed to fetch fsp extension");
+		return -1;
+	}
+
 	switch (fio->config->rsrc) {
 	case FRUIT_RSRC_STREAM:
 		nwritten = fruit_pwrite_rsrc_stream(handle, fsp, data, n, offset);
@@ -5491,6 +5506,11 @@ static int fruit_ftruncate_rsrc(struct vfs_handle_struct *handle,
 	struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
 	int ret;
 
+	if (fio == NULL) {
+		DBG_ERR("Failed to fetch fsp extension");
+		return -1;
+	}
+
 	switch (fio->config->rsrc) {
 	case FRUIT_RSRC_XATTR:
 		ret = fruit_ftruncate_rsrc_xattr(handle, fsp, offset);


-- 
Samba Shared Repository