The branch, master has been updated
via 3bb7ccb4635 s4:scripting: make samba-gpupdate heed --disable-python
via 018c93f35a8 s3/librpc/crypto: clang: Fixes Value stored to 'ret' is
never read
via 40ddcf7bdce s3/libads: clang: Fix Array access results in a null
pointer dereference
via d3371d8545b s3/librpc/crypto: clang: warning: Value stored to
'gss_maj' is never read
via f755de54135 s4/libcli/clideltree.c: clang: Value stored to 'status'
is never read
via ba55c022076 s4/libcli/smb2: clang: Fix 'value stored to 'status' is
never read'
via 076216da796 s4/libcli/smb2: clang: Fix Passed-by-value arg contains
uninitialized data
via 088a345f6ac s4/libcli/raw: clang: Fix 'Value stored to 'p' is never
read'
via a1a448b19b9 s4/libcli/raw: clang: Fix 'Dereference of null pointer'
via 55c6e4bcc1b s4/libcli/raw: clang: Fix 'Access to field results in a
deref of a null ptr
from 517ec63004f vfs_fileid: add "fsname_norootdir_ext" option
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3bb7ccb4635535cb9dd9333220222dcfffb2aed9
Author: Philipp Gesang <[email protected]>
Date: Thu Sep 19 09:03:45 2019 +0200
s4:scripting: make samba-gpupdate heed --disable-python
Signed-off-by: Philipp Gesang <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
Reviewed-by: Noel Power<[email protected]>
Autobuild-User(master): Noel Power <[email protected]>
Autobuild-Date(master): Wed Sep 25 11:06:04 UTC 2019 on sn-devel-184
commit 018c93f35a80daef74e44e32ff0ff7437eed8547
Author: Noel Power <[email protected]>
Date: Thu Aug 8 13:15:14 2019 +0000
s3/librpc/crypto: clang: Fixes Value stored to 'ret' is never read
Fixes:
source3/librpc/crypto/gse_krb5.c:63:3: warning: Value stored to 'ret' is
never read <--[clang]
ret = smb_krb5_kt_free_entry(krbctx, &kt_entry);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
Signed-off-by: Noel Power <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 40ddcf7bdcec547acdba090f43651cc5b953aded
Author: Noel Power <[email protected]>
Date: Thu Aug 8 13:12:39 2019 +0000
s3/libads: clang: Fix Array access results in a null pointer dereference
Fixes:
source3/libads/cldap.c:400:6: warning: Array access (from variable
'responses') results in a null pointer dereference <--[clang]
if (responses[0] == NULL) {
^
1 warning generated.
Signed-off-by: Noel Power <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit d3371d8545bb4303e866e991453a0bbb05dd7656
Author: Noel Power <[email protected]>
Date: Fri Aug 2 10:45:48 2019 +0000
s3/librpc/crypto: clang: warning: Value stored to 'gss_maj' is never read
Fixes: Value stored to 'gss_maj' is never read
source3/librpc/crypto/gse.c:562:3: warning: Value stored to 'gss_maj' is
never read <--[clang]
gss_maj = gss_release_buffer(&gss_min, &out_data);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
source3/librpc/crypto/gse.c:687:3: warning: Value stored to 'gss_maj' is
never read <--[clang]
gss_maj = gss_release_buffer(&gss_min, &out_data);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
source3/librpc/crypto/gse.c:739:3: warning: Value stored to 'gss_maj' is
never read <--[clang]
gss_maj = gss_release_buffer(&gss_min, &msg_min);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
source3/librpc/crypto/gse.c:742:3: warning: Value stored to 'gss_maj' is
never read <--[clang]
gss_maj = gss_release_buffer(&gss_min, &msg_maj);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4 warnings generated.
Signed-off-by: Noel Power <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit f755de54135ab5900209d093a45d9b824687a3bf
Author: Noel Power <[email protected]>
Date: Thu Aug 8 15:10:30 2019 +0100
s4/libcli/clideltree.c: clang: Value stored to 'status' is never read
Fixes:
source4/libcli/clideltree.c:113:3: warning: Value stored to 'status' is
never read <--[clang]
status = smbcli_setatr(tree, dname, FILE_ATTRIBUTE_NORMAL, 0);
^
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
source4/libcli/clideltree.c:131:3: warning: Value stored to 'status' is
never read <--[clang]
status = smbcli_setatr(dstate.tree, dname,
FILE_ATTRIBUTE_NORMAL, 0);
^
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 warnings generated.
Signed-off-by: Noel Power <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit ba55c0220767358656be125e6cecedef97317e9f
Author: Noel Power <[email protected]>
Date: Mon Jul 29 11:44:26 2019 +0000
s4/libcli/smb2: clang: Fix 'value stored to 'status' is never read'
Fixes:
source4/libcli/smb2/util.c:134:3: warning: Value stored to 'status' is
never read <--[clang]
status = smb2_util_setatr(tree, dname,
FILE_ATTRIBUTE_NORMAL);
^
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
source4/libcli/smb2/util.c:187:5: warning: Value stored to 'status' is
never read <--[clang]
status = smb2_util_setatr(tree, name,
FILE_ATTRIBUTE_NORMAL);
^
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
source4/libcli/smb2/util.c:209:3: warning: Value stored to 'status' is
never read <--[clang]
status = smb2_util_setatr(tree, dname,
FILE_ATTRIBUTE_NORMAL);
^
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3 warnings generated.
Signed-off-by: Noel Power <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 076216da7968b77e2a16cf21f879e9f159bc14da
Author: Noel Power <[email protected]>
Date: Mon Jul 29 11:22:29 2019 +0000
s4/libcli/smb2: clang: Fix Passed-by-value arg contains uninitialized data
Fixes:
source4/libcli/smb2/getinfo.c:222:11: warning: Passed-by-value struct
argument contains uninitialized data (e.g., field: 'data') <--[clang]
status = smb_raw_fsinfo_passthru_parse(b.out.blob, mem_ctx,
io->generic.level, io);
^
1 warning generated.
Signed-off-by: Noel Power <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 088a345f6acd84d888759c935a92737255e17b3f
Author: Noel Power <[email protected]>
Date: Fri Jul 26 16:23:45 2019 +0000
s4/libcli/raw: clang: Fix 'Value stored to 'p' is never read'
Fixes:
source4/libcli/raw/clisession.c:198:4: warning: Value stored to 'p' is
never read <--[clang]
p += smbcli_req_pull_string(&req->in.bufinfo,
mem_ctx, &parms->old.out.domain, p, -1, STR_TERMINATE);
^
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
source4/libcli/raw/clisession.c:212:5: warning: Value stored to 'p' is
never read <--[clang]
p +=
smbcli_req_pull_string(&req->in.bufinfo, mem_ctx, &parms->nt1.out.domain, p,
-1, STR_TERMINATE);
^
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
source4/libcli/raw/clisession.c:232:3: warning: Value stored to 'p' is
never read <--[clang]
p += smbcli_req_pull_string(&req->in.bufinfo, mem_ctx,
&parms->spnego.out.workgroup, p, -1, STR_TERMINATE);
^
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Noel Power <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit a1a448b19b9565a00e3077690dbda44ed727b2e4
Author: Noel Power <[email protected]>
Date: Fri Jul 26 16:18:49 2019 +0000
s4/libcli/raw: clang: Fix 'Dereference of null pointer'
Fixes:
source4/libcli/raw/rawfileinfo.c:597:2: warning: Dereference of null
pointer <--[clang]
SMBCLI_CHECK_WCT(req, 10);
^
source4/libcli/raw/rawfileinfo.c:639:2: warning: Dereference of null
pointer <--[clang]
SMBCLI_CHECK_WCT(req, 11);
^
Signed-off-by: Noel Power <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 55c6e4bcc1b084fc391c21b387694a099a015c83
Author: Noel Power <[email protected]>
Date: Fri Jul 26 15:06:54 2019 +0000
s4/libcli/raw: clang: Fix 'Access to field results in a deref of a null ptr
Fixes:
source4/libcli/raw/rawfileinfo.c:301:56: warning: Access to field
'transport' results in a dereference of a null pointer (loaded from variable
'session') <--[clang]
parms->standard.out.create_time = raw_pull_dos_date2(session->transport,
^
source4/libcli/raw/rawfileinfo.c:314:55: warning: Access to field
'transport' results in a dereference of a null pointer (loaded from variable
'session') <--[clang]
parms->ea_size.out.create_time = raw_pull_dos_date2(session->transport,
Signed-off-by: Noel Power <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/libads/cldap.c | 2 +-
source3/librpc/crypto/gse.c | 8 ++++----
source3/librpc/crypto/gse_krb5.c | 2 +-
source4/libcli/clideltree.c | 4 ++--
source4/libcli/raw/clisession.c | 6 +++---
source4/libcli/raw/rawfileinfo.c | 18 +++++++++++++++++-
source4/libcli/smb2/getinfo.c | 4 +++-
source4/libcli/smb2/util.c | 6 +++---
source4/scripting/wscript_build | 5 +++--
9 files changed, 37 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/cldap.c b/source3/libads/cldap.c
index f4022a19905..c44201ab8b5 100644
--- a/source3/libads/cldap.c
+++ b/source3/libads/cldap.c
@@ -397,7 +397,7 @@ bool ads_cldap_netlogon(TALLOC_CTX *mem_ctx,
"failed: %s\n", nt_errstr(status)));
return false;
}
- if (responses[0] == NULL) {
+ if (responses == NULL || responses[0] == NULL) {
DEBUG(2, ("ads_cldap_netlogon: did not get a reply\n"));
TALLOC_FREE(responses);
return false;
diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c
index 9a9f4261222..6329b194a27 100644
--- a/source3/librpc/crypto/gse.c
+++ b/source3/librpc/crypto/gse.c
@@ -559,7 +559,7 @@ init_sec_context_done:
status = NT_STATUS_NO_MEMORY;
}
- gss_maj = gss_release_buffer(&gss_min, &out_data);
+ gss_release_buffer(&gss_min, &out_data);
}
done:
@@ -684,7 +684,7 @@ static NTSTATUS gse_get_server_auth_token(TALLOC_CTX
*mem_ctx,
if (!blob.data) {
status = NT_STATUS_NO_MEMORY;
}
- gss_maj = gss_release_buffer(&gss_min, &out_data);
+ gss_release_buffer(&gss_min, &out_data);
}
@@ -736,10 +736,10 @@ static char *gse_errstr(TALLOC_CTX *mem_ctx, OM_uint32
maj, OM_uint32 min)
done:
if (msg_min.value) {
- gss_maj = gss_release_buffer(&gss_min, &msg_min);
+ gss_release_buffer(&gss_min, &msg_min);
}
if (msg_maj.value) {
- gss_maj = gss_release_buffer(&gss_min, &msg_maj);
+ gss_release_buffer(&gss_min, &msg_maj);
}
return errstr;
}
diff --git a/source3/librpc/crypto/gse_krb5.c b/source3/librpc/crypto/gse_krb5.c
index 172616ca3dc..d3db3fe03e1 100644
--- a/source3/librpc/crypto/gse_krb5.c
+++ b/source3/librpc/crypto/gse_krb5.c
@@ -60,7 +60,7 @@ static krb5_error_code flush_keytab(krb5_context krbctx,
krb5_keytab keytab)
"failed (%s)\n", error_message(ret)));
goto out;
}
- ret = smb_krb5_kt_free_entry(krbctx, &kt_entry);
+ smb_krb5_kt_free_entry(krbctx, &kt_entry);
ZERO_STRUCT(kt_entry);
/* now reopen */
diff --git a/source4/libcli/clideltree.c b/source4/libcli/clideltree.c
index e8007f4495a..01b33313213 100644
--- a/source4/libcli/clideltree.c
+++ b/source4/libcli/clideltree.c
@@ -110,7 +110,7 @@ int smbcli_deltree(struct smbcli_tree *tree, const char
*dname)
}
if (NT_STATUS_EQUAL(status, NT_STATUS_CANNOT_DELETE)) {
/* it could be read-only */
- status = smbcli_setatr(tree, dname, FILE_ATTRIBUTE_NORMAL, 0);
+ smbcli_setatr(tree, dname, FILE_ATTRIBUTE_NORMAL, 0);
if (NT_STATUS_IS_OK(smbcli_unlink(tree, dname))) {
return 1;
}
@@ -128,7 +128,7 @@ int smbcli_deltree(struct smbcli_tree *tree, const char
*dname)
status = smbcli_rmdir(dstate.tree, dname);
if (NT_STATUS_EQUAL(status, NT_STATUS_CANNOT_DELETE)) {
/* it could be read-only */
- status = smbcli_setatr(dstate.tree, dname,
FILE_ATTRIBUTE_NORMAL, 0);
+ smbcli_setatr(dstate.tree, dname, FILE_ATTRIBUTE_NORMAL, 0);
status = smbcli_rmdir(dstate.tree, dname);
}
if (NT_STATUS_IS_ERR(status)) {
diff --git a/source4/libcli/raw/clisession.c b/source4/libcli/raw/clisession.c
index 0a026c0aa30..5c3d7f9b7ff 100644
--- a/source4/libcli/raw/clisession.c
+++ b/source4/libcli/raw/clisession.c
@@ -195,7 +195,7 @@ NTSTATUS smb_raw_sesssetup_recv(struct smbcli_request *req,
if (p) {
p += smbcli_req_pull_string(&req->in.bufinfo, mem_ctx,
&parms->old.out.os, p, -1, STR_TERMINATE);
p += smbcli_req_pull_string(&req->in.bufinfo, mem_ctx,
&parms->old.out.lanman, p, -1, STR_TERMINATE);
- p += smbcli_req_pull_string(&req->in.bufinfo, mem_ctx,
&parms->old.out.domain, p, -1, STR_TERMINATE);
+ smbcli_req_pull_string(&req->in.bufinfo, mem_ctx,
&parms->old.out.domain, p, -1, STR_TERMINATE);
}
break;
@@ -209,7 +209,7 @@ NTSTATUS smb_raw_sesssetup_recv(struct smbcli_request *req,
p += smbcli_req_pull_string(&req->in.bufinfo, mem_ctx,
&parms->nt1.out.os, p, -1, STR_TERMINATE);
p += smbcli_req_pull_string(&req->in.bufinfo, mem_ctx,
&parms->nt1.out.lanman, p, -1, STR_TERMINATE);
if (p < (req->in.data + req->in.data_size)) {
- p += smbcli_req_pull_string(&req->in.bufinfo,
mem_ctx, &parms->nt1.out.domain, p, -1, STR_TERMINATE);
+ smbcli_req_pull_string(&req->in.bufinfo,
mem_ctx, &parms->nt1.out.domain, p, -1, STR_TERMINATE);
}
}
break;
@@ -229,7 +229,7 @@ NTSTATUS smb_raw_sesssetup_recv(struct smbcli_request *req,
p += parms->spnego.out.secblob.length;
p += smbcli_req_pull_string(&req->in.bufinfo, mem_ctx,
&parms->spnego.out.os, p, -1, STR_TERMINATE);
p += smbcli_req_pull_string(&req->in.bufinfo, mem_ctx,
&parms->spnego.out.lanman, p, -1, STR_TERMINATE);
- p += smbcli_req_pull_string(&req->in.bufinfo, mem_ctx,
&parms->spnego.out.workgroup, p, -1, STR_TERMINATE);
+ smbcli_req_pull_string(&req->in.bufinfo, mem_ctx,
&parms->spnego.out.workgroup, p, -1, STR_TERMINATE);
break;
case RAW_SESSSETUP_SMB2:
diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c
index a2599085ab7..235b3cd0fa2 100644
--- a/source4/libcli/raw/rawfileinfo.c
+++ b/source4/libcli/raw/rawfileinfo.c
@@ -297,6 +297,10 @@ static NTSTATUS smb_raw_info_backend(struct smbcli_session
*session,
return NT_STATUS_INVALID_LEVEL;
case RAW_FILEINFO_STANDARD:
+ if (session == NULL) {
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
FINFO_CHECK_SIZE(22);
parms->standard.out.create_time =
raw_pull_dos_date2(session->transport,
blob->data
+ 0);
@@ -310,6 +314,10 @@ static NTSTATUS smb_raw_info_backend(struct smbcli_session
*session,
return NT_STATUS_OK;
case RAW_FILEINFO_EA_SIZE:
+ if (session == NULL) {
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
FINFO_CHECK_SIZE(26);
parms->ea_size.out.create_time =
raw_pull_dos_date2(session->transport,
blob->data
+ 0);
@@ -589,6 +597,10 @@ static struct smbcli_request *smb_raw_getattr_send(struct
smbcli_tree *tree,
static NTSTATUS smb_raw_getattr_recv(struct smbcli_request *req,
union smb_fileinfo *parms)
{
+ if (req == NULL) {
+ goto failed;
+ }
+
if (!smbcli_request_receive(req) ||
smbcli_request_is_error(req)) {
return smbcli_request_destroy(req);
@@ -631,11 +643,15 @@ static struct smbcli_request
*smb_raw_getattrE_send(struct smbcli_tree *tree,
static NTSTATUS smb_raw_getattrE_recv(struct smbcli_request *req,
union smb_fileinfo *parms)
{
+ if (req == NULL) {
+ goto failed;
+ }
+
if (!smbcli_request_receive(req) ||
smbcli_request_is_error(req)) {
return smbcli_request_destroy(req);
}
-
+
SMBCLI_CHECK_WCT(req, 11);
parms->getattre.out.create_time = raw_pull_dos_date2(req->transport,
req->in.vwv +
VWV(0));
diff --git a/source4/libcli/smb2/getinfo.c b/source4/libcli/smb2/getinfo.c
index fc97620ad24..5ffb988267a 100644
--- a/source4/libcli/smb2/getinfo.c
+++ b/source4/libcli/smb2/getinfo.c
@@ -213,7 +213,9 @@ struct smb2_request *smb2_getinfo_fs_send(struct smb2_tree
*tree, union smb_fsin
NTSTATUS smb2_getinfo_fs_recv(struct smb2_request *req, TALLOC_CTX *mem_ctx,
union smb_fsinfo *io)
{
- struct smb2_getinfo b;
+ struct smb2_getinfo b = {
+ .in = {0},
+ };
NTSTATUS status;
status = smb2_getinfo_recv(req, mem_ctx, &b);
diff --git a/source4/libcli/smb2/util.c b/source4/libcli/smb2/util.c
index e28c910fb23..94072bee3ea 100644
--- a/source4/libcli/smb2/util.c
+++ b/source4/libcli/smb2/util.c
@@ -131,7 +131,7 @@ int smb2_deltree(struct smb2_tree *tree, const char *dname)
if (NT_STATUS_EQUAL(status, NT_STATUS_CANNOT_DELETE)) {
/* it could be read-only */
- status = smb2_util_setatr(tree, dname, FILE_ATTRIBUTE_NORMAL);
+ smb2_util_setatr(tree, dname, FILE_ATTRIBUTE_NORMAL);
status = smb2_util_unlink(tree, dname);
}
if (NT_STATUS_IS_OK(status)) {
@@ -184,7 +184,7 @@ int smb2_deltree(struct smb2_tree *tree, const char *dname)
status = smb2_util_unlink(tree, name);
if (NT_STATUS_EQUAL(status, NT_STATUS_CANNOT_DELETE)) {
/* it could be read-only */
- status = smb2_util_setatr(tree, name,
FILE_ATTRIBUTE_NORMAL);
+ smb2_util_setatr(tree, name,
FILE_ATTRIBUTE_NORMAL);
status = smb2_util_unlink(tree, name);
}
@@ -206,7 +206,7 @@ int smb2_deltree(struct smb2_tree *tree, const char *dname)
status = smb2_util_rmdir(tree, dname);
if (NT_STATUS_EQUAL(status, NT_STATUS_CANNOT_DELETE)) {
/* it could be read-only */
- status = smb2_util_setatr(tree, dname, FILE_ATTRIBUTE_NORMAL);
+ smb2_util_setatr(tree, dname, FILE_ATTRIBUTE_NORMAL);
status = smb2_util_rmdir(tree, dname);
}
diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
index 31c395d3e4b..c5883f1fc8c 100644
--- a/source4/scripting/wscript_build
+++ b/source4/scripting/wscript_build
@@ -5,8 +5,9 @@ from samba_utils import MODE_755
sbin_files = ''
if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
sbin_files = 'bin/samba_downgrade_db bin/samba_dnsupdate
bin/samba_spnupdate bin/samba_upgradedns bin/samba_kcc '
-sbin_files += 'bin/samba-gpupdate'
-man_files = 'man/samba-gpupdate.8'
+if not bld.env.disable_python:
+ sbin_files += 'bin/samba-gpupdate'
+ man_files = 'man/samba-gpupdate.8'
if sbin_files:
bld.INSTALL_FILES('${SBINDIR}',
--
Samba Shared Repository
