[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  0d8084ed628 ctdb-protocol: CID 1499395: Uninitialized variables (UNINIT)
       via  0f373443ef3 ctdb-tests: Fix missing #include for sigaction(2)
       via  ef9017a1503 ctdb-tests: Dump a stack trace on abort
      from  3990c33efec examples: Reformat shell scripts

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


- Log -----------------------------------------------------------------
commit 0d8084ed6281e5f6e894315d61f196a887510f8d
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Feb 16 09:32:55 2022 +1100

    ctdb-protocol: CID 1499395: Uninitialized variables (UNINIT)
    
    Issue is reported here:
    
    853     	case CTDB_CONTROL_DB_VACUUM: {
    854     		struct ctdb_db_vacuum db_vacuum;
    855
    >>>     CID 1499395:  Uninitialized variables  (UNINIT)
    >>>     Using uninitialized value "db_vacuum.full_vacuum_run" when calling "ctdb_db_vacuum_len".
    856     		CHECK_CONTROL_DATA_SIZE(ctdb_db_vacuum_len(&db_vacuum));
    857     		return ctdb_control_db_vacuum(ctdb, c, indata, async_reply);
    858     	}
    
    The problem is that ctdb_bool_len() unnecessarily dereferences its
    argument, which in this case is &db_vacuum.full_vacuum_run.  Not a
    security issue because the value copied by dereferencing is not used.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Wed Feb 23 02:02:06 UTC 2022 on sn-devel-184

commit 0f373443ef32d368c84640362786e7bd3e092c19
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Feb 16 22:12:37 2022 +1100

    ctdb-tests: Fix missing #include for sigaction(2)
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

commit ef9017a15033ec00c6661a2bab4b254dbfa41fe5
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Jan 4 22:19:19 2022 +1100

    ctdb-tests: Dump a stack trace on abort
    
    Debugging a test failure here without GDB is not possible.  Dumping a
    stack trace gives a good hint.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

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

Summary of changes:
 ctdb/protocol/protocol_basic.c         | 2 +-
 ctdb/tests/src/protocol_common_basic.c | 4 ++++
 ctdb/wscript                           | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/protocol/protocol_basic.c b/ctdb/protocol/protocol_basic.c
index 94b18c1cd10..42f207790d0 100644
--- a/ctdb/protocol/protocol_basic.c
+++ b/ctdb/protocol/protocol_basic.c
@@ -162,7 +162,7 @@ int ctdb_double_pull(uint8_t *buf, size_t buflen, double *out, size_t *npull)
 
 size_t ctdb_bool_len(bool *in)
 {
-	uint8_t u8 = *in;
+	uint8_t u8 = 0;
 
 	return ctdb_uint8_len(&u8);
 }
diff --git a/ctdb/tests/src/protocol_common_basic.c b/ctdb/tests/src/protocol_common_basic.c
index 668fb46cfb3..7567f7b6520 100644
--- a/ctdb/tests/src/protocol_common_basic.c
+++ b/ctdb/tests/src/protocol_common_basic.c
@@ -18,9 +18,12 @@
 */
 
 #include "replace.h"
+#include "system/wait.h"
 
 #include <assert.h>
 
+#include "lib/util/fault.h"
+
 #include "tests/src/protocol_common_basic.h"
 
 uint8_t BUFFER[1024*1024];
@@ -242,6 +245,7 @@ static void protocol_test_iterate_abort_handler(int sig)
        if (protocol_test_iterate_buf[0] != '\0') {
 	       fprintf(stderr, " tag: %s\n", protocol_test_iterate_buf);
        }
+       log_stack_trace();
        sigaction(SIGABRT, &act, NULL);
        abort();
 }
diff --git a/ctdb/wscript b/ctdb/wscript
index a9fef9241aa..4a28dfd3cf0 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -977,7 +977,7 @@ def build(bld):
     bld.SAMBA_SUBSYSTEM('ctdb-protocol-tests-basic',
                         source=bld.SUBDIR('tests/src',
                                           'protocol_common_basic.c'),
-                        deps='replace talloc')
+                        deps='samba-util replace talloc')
 
     bld.SAMBA_SUBSYSTEM('ctdb-protocol-tests-common',
                         source=bld.SUBDIR('tests/src',


-- 
Samba Shared Repository