[SCM] Samba Shared Repository - branch master updated

[Noel Power]

The branch, master has been updated
       via  eef0f736209 s3:smbd: Remove unnessesary NULL check for req
       via  8204e5f93f8 s3:smbd: Remove unnessesary NULL check for fsp
       via  d6eff9c413f librpc: Make sure num_protocols is initialized
       via  9b7bef7f876 s3:smbd: Make sure smb_fname is set and not NULL in dos_mode_post()
      from  f44918e6c83 s3: VFS: default: Add proc_fd's fallback for vfswrap_fchown().

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


- Log -----------------------------------------------------------------
commit eef0f73620912a6a299a2558bd76e9454141c6cd
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Jun 10 09:14:22 2021 +0200

    s3:smbd: Remove unnessesary NULL check for req
    
    We already dereference req earlier. So if it is NULL it already
    segfaulted much earlier.
    
    Found by covscan.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Pavel Filipenský <pfilipen at redhat.com>
    Reviewed-by: Noel Power <npower at samba.org>
    
    Autobuild-User(master): Noel Power <npower at samba.org>
    Autobuild-Date(master): Thu Jun 10 11:22:19 UTC 2021 on sn-devel-184

commit 8204e5f93f8a8721973095a3475d14594401dc3e
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Jun 10 09:05:53 2021 +0200

    s3:smbd: Remove unnessesary NULL check for fsp
    
    We already dereference fsp earlier. So if it is NULL it already
    segfaulted much earlier.
    
    Found by covscan.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Pavel Filipenský <pfilipen at redhat.com>
    Reviewed-by: Noel Power <npower at samba.org>

commit d6eff9c413fe4789a061fdde7105d0553a419f59
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Jun 10 08:53:19 2021 +0200

    librpc: Make sure num_protocols is initialized
    
    Found by covscan.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Pavel Filipenský <pfilipen at redhat.com>
    Reviewed-by: Noel Power <npower at samba.org>

commit 9b7bef7f8761b05e946185b9262dd089d1eeed15
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Jun 10 08:51:03 2021 +0200

    s3:smbd: Make sure smb_fname is set and not NULL in dos_mode_post()
    
    Found by covscan.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Pavel Filipenský <pfilipen at redhat.com>
    Reviewed-by: Noel Power <npower at samba.org>

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

Summary of changes:
 librpc/rpc/binding.c   | 2 +-
 source3/smbd/dosmode.c | 1 +
 source3/smbd/reply.c   | 2 +-
 source3/smbd/trans2.c  | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/rpc/binding.c b/librpc/rpc/binding.c
index 6588f43cc9d..7a2dcd472ea 100644
--- a/librpc/rpc/binding.c
+++ b/librpc/rpc/binding.c
@@ -1430,7 +1430,7 @@ _PUBLIC_ NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX *mem_ctx,
 					     struct epm_tower *tower)
 {
 	const enum epm_protocol *protseq = NULL;
-	size_t i, num_protocols;
+	size_t i, num_protocols = 0;
 	struct ndr_syntax_id abstract_syntax;
 	NTSTATUS status;
 
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index bcca7e0a50a..28724ad75bc 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -689,6 +689,7 @@ static uint32_t dos_mode_post(uint32_t dosmode,
 	if (fsp != NULL) {
 		smb_fname = fsp->fsp_name;
 	}
+	SMB_ASSERT(smb_fname != NULL);
 
 	/*
 	 * According to MS-FSA a stream name does not have
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index d453eb5e6f4..abec7857951 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3572,7 +3572,7 @@ void reply_unlink(struct smb_request *req)
 		goto out;
 	}
 
-	if (req != NULL && !req->posix_pathnames) {
+	if (!req->posix_pathnames) {
 		char *lcomp = get_original_lcomp(ctx,
 					conn,
 					name,
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index a1a3e92fafd..d6a1ea81ce0 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -7919,7 +7919,7 @@ static NTSTATUS smb_set_file_basic_info(connection_struct *conn,
 		return status;
 	}
 
-	if (fsp != NULL && fsp->fsp_flags.modified) {
+	if (fsp->fsp_flags.modified) {
 		trigger_write_time_update_immediate(fsp);
 	}
 	return NT_STATUS_OK;
@@ -7964,7 +7964,7 @@ static NTSTATUS smb_set_info_standard(connection_struct *conn,
 		return status;
 	}
 
-	if (fsp != NULL && fsp->fsp_flags.modified) {
+	if (fsp->fsp_flags.modified) {
 		trigger_write_time_update_immediate(fsp);
 	}
 	return NT_STATUS_OK;


-- 
Samba Shared Repository