[SCM] Samba Shared Repository - branch master updated

Gary Lockyer gary at samba.org
Wed Aug 28 00:23:06 UTC 2019


The branch, master has been updated
       via  2575e4066bf s3/libsmb: clang: Fix 'warning: Assigned value is garbage or undefined '
       via  ad8fd31441f s3/libsmb: clang: Fix 'Assigned value is garbage or undefined'
       via  fcb0355a74e s3/libsmb: clang: Fix '2nd func call argument is uninitalized value'
       via  e1ef9922368 s3/libsmb: clang: Fix 'The left operand of '>' or '<' is a garbage value
       via  78ca70925ca libcli/auth: clang: Fix 'Value stored to 'status' is never read'
       via  e874cc909a7 s3/libsmb: clang: Fix 'Value stored to 'p' is never read' warning
       via  bf567380a7c s3/libsmb: clang: Fix 'Value stored to 'ea_size' is never read'
       via  ce9fef5fd5e s3/libsmb: clang: Fix 'Assigned value is garbage or undefined'
       via  4bb9255473d s3/libsmb: clang: Fix 'The left operand of '&' is a garbage value'
       via  e06d34e98e1 s3/libsmb: clang: Fix 'The left operand of '!=' is a garbage value'
      from  8190993d992 ctdb-recoverd: Fix typo in previous fix

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


- Log -----------------------------------------------------------------
commit 2575e4066bf84d7a56f0b7126841f4ea5cc027fd
Author: Noel Power <noel.power at suse.com>
Date:   Wed Aug 14 14:53:01 2019 +0100

    s3/libsmb: clang: Fix 'warning: Assigned value is garbage or undefined '
    
    Fixes:
    
    source3/libsmb/clireadwrite.c:1259:17: warning: Assigned value is garbage or undefined <--[clang]
            state->written += written;
                           ^  ~~~~~~~
    
    source3/libsmb/clireadwrite.c:1722:14: warning: The left operand of '>' is a garbage value <--[clang]
            if (written > expected) {
                ~~~~~~~ ^
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
    
    Autobuild-User(master): Gary Lockyer <gary at samba.org>
    Autobuild-Date(master): Wed Aug 28 00:22:49 UTC 2019 on sn-devel-184

commit ad8fd31441f8012ae01e972d7faeba128507c5d1
Author: Noel Power <noel.power at suse.com>
Date:   Wed Aug 14 14:51:23 2019 +0100

    s3/libsmb: clang: Fix 'Assigned value is garbage or undefined'
    
    Fixes:
    
    source3/libsmb/clireadwrite.c:851:10: warning: Assigned value is garbage or undefined <--[clang]
                    *nread = ret;
                           ^
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>

commit fcb0355a74ea1c5e446c8465dd2fb017970d408e
Author: Noel Power <noel.power at suse.com>
Date:   Wed Aug 14 14:49:51 2019 +0100

    s3/libsmb: clang: Fix '2nd func call argument is uninitalized value'
    
    Fixes:
    
    source3/libsmb/clireadwrite.c:805:2: warning: 2nd function call argument is an uninitialized value <--[clang]
            memcpy(state->buf, buf, received);
            ^                  ~~~
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>

commit e1ef99223684e830e4bd5c8e7b33323e25ffafc1
Author: Noel Power <noel.power at suse.com>
Date:   Wed Aug 14 14:42:06 2019 +0100

    s3/libsmb: clang: Fix 'The left operand of '>' or '<' is a garbage value
    
    Fixes:
    
    source3/libsmb/clireadwrite.c:601:15: warning: The left operand of '>' is a garbage value <--[clang]
            if (received > expected) {
    
    source3/libsmb/clireadwrite.c:799:16: warning: The left operand of '<' is a garbage value <--[clang]
            if ((received < 0) || (received > state->buflen)) {
                 ~~~~~~~~ ^
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>

commit 78ca70925ca00ae96065db4fd7a963cb999f2f3d
Author: Noel Power <noel.power at suse.com>
Date:   Wed Aug 14 14:31:07 2019 +0100

    libcli/auth: clang: Fix 'Value stored to 'status' is never read'
    
    Fixes:
    
    libcli/auth/netlogon_creds_cli.c:2622:2: warning: Value stored to 'status' is never read <--[clang]
            status = netlogon_creds_decrypt_samlogon_validation(&state->tmp_creds,
            ^        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    1 warning generated.
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>

commit e874cc909a7f12286ae2514ceb063193469a8946
Author: Noel Power <noel.power at suse.com>
Date:   Wed Aug 14 14:28:16 2019 +0100

    s3/libsmb: clang: Fix 'Value stored to 'p' is never read' warning
    
    Fixes:
    
    source3/libsmb/clirap2.c:1197:4: warning: Value stored to 'p' is never read <--[clang]
                            p += rap_getstringp(frame,
                            ^    ~~~~~~~~~~~~~~~~~~~~~
    source3/libsmb/clirap2.c:1525:5: warning: Value stored to 'p' is never read <--[clang]
                                    p += rap_getstring(frame,
                                    ^    ~~~~~~~~~~~~~~~~~~~~
    source3/libsmb/clirap2.c:2358:3: warning: Value stored to 'p' is never read <--[clang]
                    p += WORDSIZE;            /* skip rsize */
                    ^    ~~~~~~~~
    source3/libsmb/clirap2.c:2380:3: warning: Value stored to 'p' is never read <--[clang]
                    p += rap_getstringp(frame,
                    ^    ~~~~~~~~~~~~~~~~~~~~~
    4 warnings generated.
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>

commit bf567380a7cc69bf4dc4cf7bad6bc774fcef6085
Author: Noel Power <noel.power at suse.com>
Date:   Wed Aug 14 12:21:32 2019 +0100

    s3/libsmb: clang: Fix 'Value stored to 'ea_size' is never read'
    
    Fixes:
    
    source3/libsmb/clifile.c:5290:2: warning: Value stored to 'ea_size' is never read <--[clang]
            ea_size = (size_t)IVAL(rdata,0);
            ^         ~~~~~~~~~~~~~~~~~~~~~
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>

commit ce9fef5fd5ea5475748e99ba1e72abcb557afd83
Author: Noel Power <noel.power at suse.com>
Date:   Wed Aug 14 11:59:05 2019 +0100

    s3/libsmb: clang: Fix 'Assigned value is garbage or undefined'
    
    Fixes:
    
    source3/libsmb/clifile.c:4898:10: warning: Assigned value is garbage or undefined <--[clang]
                    *bsize = (uint64_t)old_bsize;
                           ^ ~~~~~~~~~~~~~~~~~~~
    source3/libsmb/clifile.c:4901:10: warning: Assigned value is garbage or undefined <--[clang]
                    *total = (uint64_t)old_total;
                           ^ ~~~~~~~~~~~~~~~~~~~
    source3/libsmb/clifile.c:4904:10: warning: Assigned value is garbage or undefined <--[clang]
                    *avail = (uint64_t)old_avail;
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>

commit 4bb9255473dae1e55b7711a9a2851533503ddb22
Author: Noel Power <noel.power at suse.com>
Date:   Wed Aug 14 11:40:46 2019 +0100

    s3/libsmb: clang: Fix 'The left operand of '&' is a garbage value'
    
    Fixes:
    
    source3/libsmb/clifile.c:3108:26: warning: The left operand of '&' is a garbage value <--[clang]
                (cr.file_attributes & FILE_ATTRIBUTE_DIRECTORY))
                 ~~~~~~~~~~~~~~~~~~ ^
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>

commit e06d34e98e1d01d04997c342255595ddf74fb388
Author: Noel Power <noel.power at suse.com>
Date:   Wed Aug 14 11:25:19 2019 +0100

    s3/libsmb: clang: Fix 'The left operand of '!=' is a garbage value'
    
    Fixes:
    
    source3/libsmb/clifile.c:789:15: warning: The left operand of '!=' is a garbage value <--[clang]
            if (num_data != 100) {
                ~~~~~~~~ ^
    
    Signed-off-by: Noel Power <noel.power at suse.com>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>

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

Summary of changes:
 libcli/auth/netlogon_creds_cli.c |  2 +-
 source3/libsmb/clifile.c         |  7 +++----
 source3/libsmb/clirap2.c         |  7 +++----
 source3/libsmb/clireadwrite.c    | 10 +++++-----
 4 files changed, 12 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/auth/netlogon_creds_cli.c b/libcli/auth/netlogon_creds_cli.c
index 50a5f50a57d..c5a100c3c0e 100644
--- a/libcli/auth/netlogon_creds_cli.c
+++ b/libcli/auth/netlogon_creds_cli.c
@@ -2622,7 +2622,7 @@ static void netlogon_creds_cli_LogonSamLogon_done(struct tevent_req *subreq)
 	status = netlogon_creds_decrypt_samlogon_validation(&state->tmp_creds,
 							    state->validation_level,
 							    state->validation);
-	if (tevent_req_nterror(req, result)) {
+	if (tevent_req_nterror(req, status)) {
 		netlogon_creds_cli_LogonSamLogon_cleanup(req, result);
 		return;
 	}
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index e696b536093..987b04d0a66 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -777,7 +777,7 @@ static void cli_posix_stat_done(struct tevent_req *subreq)
 	struct stat_state *state = tevent_req_data(req, struct stat_state);
 	SMB_STRUCT_STAT *sbuf = state->sbuf;
 	uint8_t *data;
-	uint32_t num_data;
+	uint32_t num_data = 0;
 	NTSTATUS status;
 
 	status = cli_qpathinfo_recv(subreq, state, &data, &num_data);
@@ -3004,7 +3004,7 @@ NTSTATUS cli_open(struct cli_state *cli, const char *fname, int flags,
 	unsigned int openfn = 0;
 	unsigned int dos_deny = 0;
 	uint32_t access_mask, share_mode, create_disposition, create_options;
-	struct smb_create_returns cr;
+	struct smb_create_returns cr = {0};
 
 	/* Do the initial mapping into OpenX parameters. */
 	if (flags & O_CREAT) {
@@ -4839,7 +4839,7 @@ NTSTATUS cli_disk_size(struct cli_state *cli, const char *path, uint64_t *bsize,
 {
 	uint64_t sectors_per_block;
 	uint64_t bytes_per_sector;
-	int old_bsize, old_total, old_avail;
+	int old_bsize = 0, old_total = 0, old_avail = 0;
 	NTSTATUS status;
 
 	if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
@@ -5287,7 +5287,6 @@ static bool parse_ea_blob(TALLOC_CTX *ctx, const uint8_t *rdata,
 		return false;
 	}
 
-	ea_size = (size_t)IVAL(rdata,0);
 	p = rdata + 4;
 
 	for (num_eas = 0; num_eas < *pnum_eas; num_eas++ ) {
diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c
index 3dd299c1cb3..fdff34fcf64 100644
--- a/source3/libsmb/clirap2.c
+++ b/source3/libsmb/clirap2.c
@@ -1194,7 +1194,7 @@ int cli_NetFileGetInfo(struct cli_state *cli, uint32_t file_id, void (*fn)(const
 					rdata,
 					converter,
 					endp);
-			p += rap_getstringp(frame,
+			rap_getstringp(frame,
 					p,
 					&fuser,
 					rdata,
@@ -1522,7 +1522,7 @@ bool cli_get_pdc_name(struct cli_state *cli, const char *workgroup, char **pdc_n
 			if (count > 0) {
 				TALLOC_CTX *frame = talloc_stackframe();
 				char *dcname;
-				p += rap_getstring(frame,
+				rap_getstring(frame,
 					p,
 					&dcname,
 					endp);
@@ -2355,7 +2355,6 @@ int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation,
 
 		p = rparam + WORDSIZE;
 		GETWORD(p, converter,endp);
-		p += WORDSIZE;            /* skip rsize */
 
 		p = rdata;
 		endp = rdata + rdrcnt;
@@ -2377,7 +2376,7 @@ int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation,
 		GETDWORD(p, sess_time, endp);
 		GETDWORD(p, idle_time, endp);
 		GETDWORD(p, user_flags, endp);
-		p += rap_getstringp(frame,
+		rap_getstringp(frame,
 				p,
 				&clitype_name,
 				rdata,
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index da188db7c31..9349b9485e8 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -580,7 +580,7 @@ static void cli_pull_chunk_done(struct tevent_req *subreq)
 		struct cli_pull_state);
 	NTSTATUS status;
 	size_t expected = chunk->total_size - chunk->tmp_size;
-	ssize_t received;
+	ssize_t received = 0;
 	uint8_t *buf = NULL;
 
 	chunk->subreq = NULL;
@@ -781,7 +781,7 @@ static void cli_read_done(struct tevent_req *subreq)
 		req, struct cli_read_state);
 	NTSTATUS status;
 	ssize_t received;
-	uint8_t *buf;
+	uint8_t *buf = NULL;
 
 	if (smbXcli_conn_protocol(state->cli->conn) >= PROTOCOL_SMB2_02) {
 		status = cli_smb2_read_recv(subreq, &received, &buf);
@@ -796,7 +796,7 @@ static void cli_read_done(struct tevent_req *subreq)
 	if (tevent_req_nterror(req, status)) {
 		return;
 	}
-	if ((received < 0) || (received > state->buflen)) {
+	if ((buf == NULL) || (received < 0) || (received > state->buflen)) {
 		state->received = 0;
 		tevent_req_nterror(req, NT_STATUS_UNEXPECTED_IO_ERROR);
 		return;
@@ -839,7 +839,7 @@ NTSTATUS cli_read(struct cli_state *cli, uint16_t fnum,
 		 size_t *nread)
 {
 	NTSTATUS status;
-	off_t ret;
+	off_t ret = 0;
 
 	status = cli_pull(cli, fnum, offset, size, size,
 			  cli_read_sink, &buf, &ret);
@@ -1248,7 +1248,7 @@ static void cli_smb1_writeall_written(struct tevent_req *subreq)
 	struct cli_smb1_writeall_state *state = tevent_req_data(
 		req, struct cli_smb1_writeall_state);
 	NTSTATUS status;
-	size_t written, to_write;
+	size_t written = 0, to_write;
 
 	status = cli_write_andx_recv(subreq, &written);
 	TALLOC_FREE(subreq);


-- 
Samba Shared Repository



More information about the samba-cvs mailing list