]> git.ipfire.org Git - thirdparty/samba.git/log
thirdparty/samba.git
13 months agos4:torture: Initialize pointer with NULL
Andreas Schneider [Tue, 2 Jul 2024 09:37:25 +0000 (11:37 +0200)] 
s4:torture: Initialize pointer with NULL

"Error: UNINIT (CWE-457):
samba-4.20.0rc2/source4/torture/rpc/samsync.c:342: var_decl: Declaring variable ""dom_sid"" without initializer.
samba-4.20.0rc2/source4/torture/rpc/samsync.c:385: uninit_use_in_call: Using uninitialized value ""dom_sid"" when calling ""dom_sid_dup"".
  383|    }
  384|    if (samsync_state->domain_handle[database_id]) {
  385|->  samsync_state->sid[database_id] = dom_sid_dup(samsync_state, dom_sid);
  386|    }
  387|"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
13 months agoexamples: Initialize char arrays
Andreas Schneider [Fri, 28 Jun 2024 12:36:59 +0000 (14:36 +0200)] 
examples: Initialize char arrays

"Error: UNINIT (CWE-457):
samba-4.20.0rc2/examples/libsmbclient/testacl.c:35: var_decl: Declaring variable ""value"" without initializer.
samba-4.20.0rc2/examples/libsmbclient/testacl.c:254: uninit_use_in_call: Using uninitialized value ""*value"" as argument to ""%s"" when calling ""printf"". [Note: The source code implementation of the function has been overridden by a builtin model.]
  252|    }
  253|
  254|->  printf(""Attributes for [%s] are:\n%s\n"", path, value);
  255|
  256|    if (stat_and_retry)"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
13 months agos3:smbd: Fix invalid memory free
Andreas Schneider [Wed, 26 Jun 2024 14:11:57 +0000 (16:11 +0200)] 
s3:smbd: Fix invalid memory free

"Error: BAD_FREE (CWE-590):
samba-4.20.0rc2/source3/smbd/smb1_process.c:1485: array_free: ""smb1_srv_send"" frees array ""errbuf"".
 1483|    char errbuf[smb_size];
 1484|    error_packet(errbuf, 0, 0, status, __LINE__, __FILE__);
 1485|->  if (!smb1_srv_send(req->xconn,
 1486|       errbuf,
 1487|       true,"

Pair-Programmed-With: Ralph Boehme <slow@samba.org>
Signed-off-by: Ralph Boehme <slow@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
13 months agos3:smbd: Remove trailing spaces in seal.c
Andreas Schneider [Wed, 26 Jun 2024 14:14:47 +0000 (16:14 +0200)] 
s3:smbd: Remove trailing spaces in seal.c

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
13 months agos3:smbd: Remove trailing spaces in smb1_process.c
Andreas Schneider [Wed, 26 Jun 2024 14:13:09 +0000 (16:13 +0200)] 
s3:smbd: Remove trailing spaces in smb1_process.c

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
13 months agos3:registry: Use correct integer sizes
Andreas Schneider [Wed, 26 Jun 2024 12:32:41 +0000 (14:32 +0200)] 
s3:registry: Use correct integer sizes

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
13 months agos3:registry: Check for integer overflow
Andreas Schneider [Wed, 26 Jun 2024 12:31:48 +0000 (14:31 +0200)] 
s3:registry: Check for integer overflow

"Error: INTEGER_OVERFLOW (CWE-190):
samba-4.20.0rc2/source3/registry/regfio.c:175: tainted_data_argument: The check ""bytes_read < block_size"" contains the tainted expression ""bytes_read"" which causes ""block_size"" to be considered tainted.
samba-4.20.0rc2/source3/registry/regfio.c:176: overflow: The expression ""block_size - bytes_read"" is deemed overflowed because at least one of its arguments has overflowed.
samba-4.20.0rc2/source3/registry/regfio.c:176: overflow_sink: ""block_size - bytes_read"", which might have underflowed, is passed to ""read(file->fd, buffer + bytes_read, block_size - bytes_read)"". [Note: The source code implementation of the function has been overridden by a builtin model.]
  174|
  175|    while ( bytes_read < block_size ) {
  176|->  if ( (returned = read( file->fd, buffer+bytes_read, block_size-bytes_read )) == -1 ) {
  177|    DEBUG(0,(""read_block: read() failed (%s)\n"", strerror(errno) ));
  178|    return False;"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
13 months agothird_party: Update nss_wrapper to version 1.1.16
Andreas Schneider [Fri, 5 Jul 2024 11:09:53 +0000 (13:09 +0200)] 
third_party: Update nss_wrapper to version 1.1.16

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Mon Jul  8 06:28:47 UTC 2024 on atb-devel-224

13 months agos3:ntlm_auth: make logs more consistent with length check
Jones Syue [Fri, 5 Jul 2024 09:36:46 +0000 (17:36 +0800)] 
s3:ntlm_auth: make logs more consistent with length check

Run ntlm_auth with options --lm-response/--nt-response/--challenge, and pass
wrong length to these options, got error prompted logs about 'only got xxx
bytes', which are not consistent with length check. This patch revise logs
for length check to make it more consistent.

For example --lm-response requires exact 24 hex, let us input three kinds
of length 23 24 25, prompted logs said 'only got 25 bytes' seems confusing.

script:
for length in 23 24 25; \
do \
    ntlm_auth --username=${un} --password=${pw} \
    --lm-response="`openssl rand -hex ${length}`"; \
done;

output:
hex decode of 04db772593f5e6023d0ab4bc67a942c9179963477eb49d failed! (only got 23 bytes)
NT_STATUS_OK: The operation completed successfully. (0x0)
hex decode of 1e57749feb46bedcf969af6cbbe10e21d0232e35c27eb07294 failed! (only got 25 bytes)

After patch it shows 'got 25 bytes, expected 24' seems more consistent:

hex decode of e13e70c9cf2ac1e20015657c4bec53435b1b948febb63f failed! (got 23 bytes, expected 24)
NT_STATUS_OK: The operation completed successfully. (0x0)
hex decode of 64647005243092b036856f572faad262e0b69386d095d60f54 failed! (got 25 bytes, expected 24)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15677

Signed-off-by: Jones Syue <jonessyue@qnap.com>
Reviewed-by: David Mulder <dmulder@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Jul  6 00:52:02 UTC 2024 on atb-devel-224

13 months agolib: Remove unused py_reparse_symlink_get
Volker Lendecke [Thu, 4 Jul 2024 11:48:37 +0000 (13:48 +0200)] 
lib: Remove unused py_reparse_symlink_get

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
13 months agotests: Use the general py_reparse_get
Volker Lendecke [Thu, 4 Jul 2024 11:46:38 +0000 (13:46 +0200)] 
tests: Use the general py_reparse_get

This was the only user of py_reparse_symlink_get

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
13 months agotests: Remove a pointless ;
Volker Lendecke [Thu, 4 Jul 2024 11:45:44 +0000 (13:45 +0200)] 
tests: Remove a pointless ;

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
13 months agolib: Add general py_reparse_get parsing routine
Volker Lendecke [Mon, 17 Jun 2024 17:50:18 +0000 (19:50 +0200)] 
lib: Add general py_reparse_get parsing routine

Will superseed py_reparse_symlink_get

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
13 months agothird_party/heimdal: Import lorikeet-heimdal-202407041740 (commit 42ba2a6e5dd1bc14a8b...
Ralph Boehme [Thu, 4 Jul 2024 16:00:52 +0000 (18:00 +0200)] 
third_party/heimdal: Import lorikeet-heimdal-202407041740 (commit 42ba2a6e5dd1bc14a8b5ada8c9b8ace85956f6a0)

Fix clock skew error message and memory cache clock skew recovery

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15676

Signed-off-by: Ralph Boehme <slow@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Fri Jul  5 10:02:26 UTC 2024 on atb-devel-224

13 months agos3:rpc_server: Initialize array struct security_ace ace[]
Pavel Filipenský [Wed, 3 Jul 2024 15:55:31 +0000 (17:55 +0200)] 
s3:rpc_server: Initialize array struct security_ace ace[]

Error: UNINIT (CWE-457):
samba-4.20.0rc2/source4/torture/smb2/lease.c:567: var_decl: Declaring variable "h" without initializer.
samba-4.20.0rc2/source4/torture/smb2/lease.c:642: uninit_use_in_call: Using uninitialized value "h" when calling "smb2_util_close".
  640|
  641|    done:
  642|->         smb2_util_close(tree, h);
  643|           smb2_util_close(tree, h2);
  644|

Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Fri Jul  5 08:53:08 UTC 2024 on atb-devel-224

13 months agos4:torture: Initialize struct smb2_handle consistently in lease.c
Pavel Filipenský [Wed, 3 Jul 2024 15:53:22 +0000 (17:53 +0200)] 
s4:torture: Initialize struct smb2_handle consistently in lease.c

Error: UNINIT (CWE-457):
samba-4.20.0rc2/source4/torture/smb2/lease.c:567: var_decl: Declaring variable "h" without initializer.
samba-4.20.0rc2/source4/torture/smb2/lease.c:642: uninit_use_in_call: Using uninitialized value "h" when calling "smb2_util_close".
  640|
  641|    done:
  642|->         smb2_util_close(tree, h);
  643|           smb2_util_close(tree, h2);
  644|

Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
13 months agos3:registry: Initialize struct security_ace ace[]
Pavel Filipenský [Wed, 3 Jul 2024 15:34:47 +0000 (17:34 +0200)] 
s3:registry: Initialize struct security_ace ace[]

Error: UNINIT (CWE-457):
samba-4.20.0rc2/source3/registry/reg_dispatcher.c:43: var_decl: Declaring variable "ace" without initializer.
samba-4.20.0rc2/source3/registry/reg_dispatcher.c:66: uninit_use_in_call: Using uninitialized value "*ace". Field "ace->object" is uninitialized when calling "make_sec_acl".
  64|           /* create the security descriptor */
  65|
  66|->         theacl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace);
  67|           if (theacl == NULL) {
  68|                   return WERR_NOT_ENOUGH_MEMORY;

Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
13 months agos3:rpcclient: Initialize spoolss_DriverDirectoryInfo info
Pavel Filipenský [Wed, 3 Jul 2024 15:33:20 +0000 (17:33 +0200)] 
s3:rpcclient: Initialize spoolss_DriverDirectoryInfo info

Error: UNINIT (CWE-457):
samba-4.20.0rc2/source3/rpcclient/cmd_spoolss.c:1530: var_decl: Declaring variable "info" without initializer.
samba-4.20.0rc2/source3/rpcclient/cmd_spoolss.c:1578: uninit_use_in_call: Using uninitialized value "info" when calling "display_printdriverdir_1".
 1576|
 1577|           if (W_ERROR_IS_OK(result)) {
 1578|->                 display_printdriverdir_1(&info.info1);
 1579|           }
 1580|

Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
13 months agos3:utils: Initialize DATA_BLOB blob
Pavel Filipenský [Wed, 3 Jul 2024 15:30:51 +0000 (17:30 +0200)] 
s3:utils: Initialize DATA_BLOB blob

Error: UNINIT (CWE-457):
samba-4.20.0rc2/source3/utils/regedit_dialog.c:1965: var_decl: Declaring variable "blob" without initializer.
samba-4.20.0rc2/source3/utils/regedit_dialog.c:2044: uninit_use_in_call: Using uninitialized value "blob" when calling "reg_val_set".
 2042|
 2043|           if (W_ERROR_IS_OK(rv)) {
 2044|->                 rv = reg_val_set(edit->key, name, edit->type, blob);
 2045|           }
 2046|

Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
13 months agosmbd: Don't talloc_zero where we assign the struct a line below
Volker Lendecke [Thu, 27 Jun 2024 14:46:16 +0000 (16:46 +0200)] 
smbd: Don't talloc_zero where we assign the struct a line below

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Thu Jul  4 16:31:39 UTC 2024 on atb-devel-224

13 months agolib: Remove a few duplicate prototypes
Volker Lendecke [Thu, 27 Jun 2024 16:20:05 +0000 (18:20 +0200)] 
lib: Remove a few duplicate prototypes

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
13 months agolib: Remove unused strnrchr_w
Volker Lendecke [Thu, 27 Jun 2024 15:54:56 +0000 (17:54 +0200)] 
lib: Remove unused strnrchr_w

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
13 months agolib: Remove unused strnrchr_m
Volker Lendecke [Thu, 27 Jun 2024 15:54:01 +0000 (17:54 +0200)] 
lib: Remove unused strnrchr_m

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
13 months agodocs: "share:fake_fscaps" is per share, not global
Volker Lendecke [Wed, 3 Jul 2024 07:58:02 +0000 (09:58 +0200)] 
docs: "share:fake_fscaps" is per share, not global

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
13 months agosmbd: Use new symlink_target_path routine
Volker Lendecke [Thu, 4 Jul 2024 09:07:54 +0000 (11:07 +0200)] 
smbd: Use new symlink_target_path routine

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
13 months agolibcli: New routine symlink_target_path for [MS-SMB2] 2.2.2.2.1.1
Volker Lendecke [Wed, 3 Jul 2024 13:55:46 +0000 (15:55 +0200)] 
libcli: New routine symlink_target_path for [MS-SMB2] 2.2.2.2.1.1

Right now the only user is the user-space symlink following in
smbd. We will use it in libsmb as well to correctly handle
STOPPED_ON_SYMLINK. When trying to upstream that code I found the
previous_slash function incredibly hard to understand.

This new routine makes copy of "const char *_name_in", so that we can
replace previous_slash with a simple strrchr_m. If that's too
slow (which I doubt, this is "only" chasing symlinks) we can always do
something smarter again.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
13 months agosmbd: Rename symlink_target_path to _symlink_target_path
Volker Lendecke [Wed, 3 Jul 2024 13:38:18 +0000 (15:38 +0200)] 
smbd: Rename symlink_target_path to _symlink_target_path

Only temporary, next step is a new more general symlink_target_path
routine, we'll need that in libcli/smb as well.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
13 months agogitlab-ci: Also add the git directory for pipeline in the main mirror
Andreas Schneider [Wed, 3 Jul 2024 11:05:51 +0000 (13:05 +0200)] 
gitlab-ci: Also add the git directory for pipeline in the main mirror

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Jul  4 08:08:49 UTC 2024 on atb-devel-224

13 months agoRevert "pidl: Use non-existent function dissect_ndr_int64()"
John Thacker [Sat, 22 Jun 2024 11:08:27 +0000 (07:08 -0400)] 
Revert "pidl: Use non-existent function dissect_ndr_int64()"

This reverts commit a836b433ed7f0acca546558d2aec359155999f30.

Wireshark's NDR dissector dissects both signed and unsigned types
of the same size and alignment with the same functions, e.g. see
the handling of "udlong" and "dlong." It is passing the FT_UINT64
vs FT_INT64 field type enum value that determines at the last
moment whether a value is cast to signed. dissect_ndr_uint64()
already has the proper behavior for 8-byte aligned signed 64 bit
integers, and a dissect_ndr_int64() function will not need to be
introduced.

Signed-off-by: John Thacker <johnthacker@gmail.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Jul  3 14:19:04 UTC 2024 on atb-devel-224

13 months agosmbd: correctly restore ENOENT if fstatfs() modifies it
Stefan Metzmacher [Wed, 3 Jul 2024 08:58:33 +0000 (10:58 +0200)] 
smbd: correctly restore ENOENT if fstatfs() modifies it

Review with: git show -U5

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Jul  3 11:41:12 UTC 2024 on atb-devel-224

13 months agopidl:Wireshark Fix the type of array of pointerse to hf_ values
John Thacker [Tue, 25 Jun 2024 22:40:20 +0000 (18:40 -0400)] 
pidl:Wireshark Fix the type of array of pointerse to hf_ values

Picked from Wireshark's fork:

    commit e1d9a226a2b8f2824a0eb162a8dc972e6e6c2dd4
    Author: Guy Harris <gharris@sonic.net>
    Date:   Thu Jun 18 18:14:46 2020 -0700

        Fix the type of arrays of pointers to hf_ values for bitfield routines.

        The static arrays are supposed to be arrays of const pointers to int,
        not arrays of non-const pointers to const int.

        Fixing that means some bugs (scribbling on what's *supposed* to be a
        const array) will be caught (see packet-ieee80211-radiotap.c for
        examples, the first of which inspired this change and the second of
        which was discovered while testing compiles with this change), and
        removes the need for some annoying casts.

        Also make some of those arrays static while we're at it.

        Update documentation and dissector-generator tools.

        Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc
        Reviewed-on: https://code.wireshark.org/review/37517
        Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Signed-off-by: John Thacker <johnthacker@gmail.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
Autobuild-Date(master): Wed Jul  3 02:35:43 UTC 2024 on atb-devel-224

13 months agopidl:Wireshark Rename tvb_new_subset()
John Thacker [Tue, 25 Jun 2024 22:38:43 +0000 (18:38 -0400)] 
pidl:Wireshark Rename tvb_new_subset()

Picked from Wireshark's fork:

    commit 7cd6906056922e4b8f68f1216d94eaa0809896fe
    Author: Guy Harris <guy@alum.mit.edu>
    Date:   Mon Jan 9 22:18:49 2017 -0800

        Rename tvb_new_subset() to tvb_new_subset_length_caplen().

        This emphasizes that there is no such thing as *the* routine to
        construct a subset tvbuff; you need to choose one of
        tvb_new_subset_remaining() (if you want a new tvbuff that contains
        everything past a certain point in an existing tvbuff),
        tvb_new_subset_length() (if you want a subset that contains everything
        past a certain point, for some number of bytes, in an existing tvbuff),
        and tvb_new_subset_length_caplen() (for all other cases).

        Many of the calls to tvb_new_subset_length_caplen() should really be
        calling one of the other routines; that's the next step.  (This also
        makes it easier to find the calls that need fixing.)

        Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b
        Reviewed-on: https://code.wireshark.org/review/19597
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Signed-off-by: John Thacker <johnthacker@gmail.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
13 months agopidl:Wireshark Get rid of Boolean "flags" with no bit set
John Thacker [Tue, 25 Jun 2024 22:37:28 +0000 (18:37 -0400)] 
pidl:Wireshark Get rid of Boolean "flags" with no bit set

Picked from Wireshark's fork:

    commit 5ae9af9e50c89d8700e5a166a9c345fc46b3a4ca
    Author: Guy Harris <guy@alum.mit.edu>
    Date:   Sun Nov 6 11:02:51 2016 -0800

        Get rid of Boolean "flags" that don't have any bit set.

        And tweak the Pidl generator for Wireshark not to generate "flags" like
        that.

        (The generator also does field name and true/false strings' case
        differently, so I didn't use it to regenerate the dissectors; that needs
        to be looked at.)

        Change-Id: Ie1657a782ebdb107e58792cedd29bbaa79b17bd4
        Reviewed-on: https://code.wireshark.org/review/18695
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Signed-off-by: John Thacker <johnthacker@gmail.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
13 months agopidl:Wireshark Fix array of pointers NULL termination
John Thacker [Tue, 25 Jun 2024 22:31:39 +0000 (18:31 -0400)] 
pidl:Wireshark Fix array of pointers NULL termination

Picked from Wireshark's PIDL fork:

    commit c07fd447c362099b04eedb445e8fa469643403f7
    Author: Binh Trinh <beango@gmail.com>
    Date:   Fri Jun 17 21:46:11 2016 -0400

        DCE/RPC: fix array of pointers with NULL

        Change-Id: Ie89f8fd4ec744d427d41866206d5a6784c5b224f
        Reviewed-on: https://code.wireshark.org/review/16004
        Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Signed-off-by: John Thacker <johnthacker@gmail.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
13 months agopidl:Wireshark Use proto_tree_add_bitmask_with_flags
John Thacker [Tue, 25 Jun 2024 22:30:22 +0000 (18:30 -0400)] 
pidl:Wireshark Use proto_tree_add_bitmask_with_flags

Picked from the Wireshark fork:

    commit 9a5e6a6884b2369527638fecd49c4c58d8c10378
    Author: Michael Mann <mmann78@netscape.net>
    Date:   Wed Jun 15 15:35:51 2016 -0400

        DCE/RPC proto_tree_add_boolean -> proto_tree_add_bitmask_with_flags

        Change-Id: I8891ec90244ffd9609d8443df631a7c8e6453b7e
        Reviewed-on: https://code.wireshark.org/review/15942
        Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Signed-off-by: John Thacker <johnthacker@gmail.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
13 months agocmdline:burn: add a note about short option combinations
Douglas Bagnall [Tue, 2 Jul 2024 23:50:43 +0000 (11:50 +1200)] 
cmdline:burn: add a note about short option combinations

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15674

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agocmdline:burn: explicitly burn --username
Douglas Bagnall [Tue, 2 Jul 2024 23:23:36 +0000 (11:23 +1200)] 
cmdline:burn: explicitly burn --username

This is the long form of -U in samba-tool.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agocmdline:burn: use allowlist to ensure more passwords burn
Douglas Bagnall [Sat, 29 Jun 2024 01:44:46 +0000 (13:44 +1200)] 
cmdline:burn: use allowlist to ensure more passwords burn

We treat any option containing 'pass' with suspicion, unless we know it
is OK.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15674

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agocmdline: test_cmdline tests more burning
Douglas Bagnall [Sat, 29 Jun 2024 01:43:03 +0000 (13:43 +1200)] 
cmdline: test_cmdline tests more burning

We have more secret arguments, like --client-password, --adminpass,
so we are going to use an allowlist for options containing 'pass', but
we don't want to burn the likes of --group=passionfruit.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15674

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agocmdline:burn: do not burn options starting --user-*, --password-*
Douglas Bagnall [Fri, 28 Jun 2024 23:30:19 +0000 (11:30 +1200)] 
cmdline:burn: do not burn options starting --user-*, --password-*

We have options that start with --user or --password that we don't
want to burn. Some grepping says:

      2 --user1
      1 --user2
     10 --user-allowed-to-authenticate-from
      6 --user-allowed-to-authenticate-to
      2 --user-allow-ntlm-auth
     25 --user-authentication-policy
      1 --user-config
      4 --user-domgroups
      5 --user-ext-name
      2 --user-groups
      6 --user-info
     27 --username
      1 --username2
      2 --userou
      1 --users
      2 --user-sidinfo
      6 --user-sids
     14 --user-tgt-lifetime-mins
      2 --password2
    118 --password-file
      2 --password-from-stdin
      # from here, grepping for strings around POPT_ constants
      5 "user"
      2 "user1"
      2 "user2"
      1 "userd"
      1 "user-domgroups"
      1 "user-groups"
      1 "user-info"
      2 "username"
      1 "user-sidinfo"
      1 "user-sids"
      1 passwordd
      4 "password"

Not all of these use lib/cmdline, but I think most do, via Python
which defers to cmdline_burn().

Note that there are options we should burn that aren't on this list,
like --adminpass. That's another matter.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15674

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agocmdline:burn: localise some variables
Douglas Bagnall [Thu, 27 Jun 2024 04:33:16 +0000 (16:33 +1200)] 
cmdline:burn: localise some variables

As this function increases in complexity, it helps to keep things close.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15674

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agocmdline:burn: always return true if burnt
Douglas Bagnall [Thu, 27 Jun 2024 04:03:30 +0000 (16:03 +1200)] 
cmdline:burn: always return true if burnt

Before we have been trying to cram three cases into a boolean return
value:

 * cmdline had secrets, we burnt them       ->  true
 * cmdline had no secrets, all good         ->  false
 * cmdline has NULL string, WTF! emergency! ->  false

This return value is only used by Python which wants to know whether to
go to the trouble of replacing the command line. If samba_cmdline_burn()
returns false, no action is taken.

If samba_cmdline_burn() burns a password and then hits a NULL, it would
be better not to do nothing. It would be better to crash. And that is
what Python will end up doing, by some talloc returning NULL triggering
a MemoryError.

What about the case like {"--foo", NULL, "-Ua%b"} where the secret comes
after the NULL? That will still be ignored by Python, as it is by all C
tools, but we are hoping that can't happen anyway.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15674

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agocmdline:burn: handle arguments separated from their --options
Douglas Bagnall [Thu, 27 Jun 2024 03:40:16 +0000 (15:40 +1200)] 
cmdline:burn: handle arguments separated from their --options

We weren't treating "--password secret" the same as "--password=secret",
which sometimes led to secrets not being redacted.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15674

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agocmdline:burn: do not retain false memories
Douglas Bagnall [Thu, 27 Jun 2024 03:20:27 +0000 (15:20 +1200)] 
cmdline:burn: do not retain false memories

If argv contains a secret option without an '=' (or in the case of
"-U", the username is separated by space), we will get to the
`if (strlen(p) == ulen) { continue; }` without resetting the found
and is_user variables. This *sometimes* has the right effect, because
the next string in argv ought to contain the secret.

But in a case like {"--password", "1234567890"}, where the secret
string is the same length as the option, we *again* take that branch
and the password is not redacted, though the argument after it will be
unless it is also of the same length.

If we always set the flags at the start we avoid this. This makes
things worse in the short term for secrets that are not the same
length as their options, but we'll get to that in another commit soon.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15674

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agocmdline:tests: extend cmdline_burn tests
Douglas Bagnall [Thu, 27 Jun 2024 03:05:03 +0000 (15:05 +1200)] 
cmdline:tests: extend cmdline_burn tests

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15674

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agoselftest: run the cmdline tests that we already have
Douglas Bagnall [Thu, 27 Jun 2024 05:04:47 +0000 (17:04 +1200)] 
selftest: run the cmdline tests that we already have

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15674

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agocmdline:burn: '-U' does not imply secrets without '%'
Douglas Bagnall [Thu, 20 Jun 2024 21:21:43 +0000 (09:21 +1200)] 
cmdline:burn: '-U' does not imply secrets without '%'

We return true from this function when a secret has been erased,
and were accidentally treating  as if it had secrets.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15671

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agodocs-xml:manpages: allow for longer version strings
Douglas Bagnall [Thu, 20 Jun 2024 23:29:36 +0000 (11:29 +1200)] 
docs-xml:manpages: allow for longer version strings

The default value (30) truncates "Samba 4.21.0pre1-DEVELOPERBUILD" to
"Samba 4.21.0pre1-DEVELOPE" in the bottom left corner of the man page.
("Samba 4.21.0pre1-DEVELOPE" is only 25 bytes long, not 30, but let's
not worry about that).

On narrow terminals (< ~75 columns) this makes it more likely that
the version string will run into the date string.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15672

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agobuild: --vendor-suffix instead of --vendor-patch-revision --vendor-name
Douglas Bagnall [Thu, 20 Jun 2024 22:40:59 +0000 (10:40 +1200)] 
build: --vendor-suffix instead of --vendor-patch-revision --vendor-name

In practice there isn't a use for two options, and neither quite
matched what people thought they were doing.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15673

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agobuildtools: sanitise strange characters in vendor strings
Douglas Bagnall [Thu, 20 Jun 2024 22:38:40 +0000 (10:38 +1200)] 
buildtools: sanitise strange characters in vendor strings

There is no reason to think '-' and '+' are the only characters that
might sneak into a vendor string; Debian habitually use '~'.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15673

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
13 months agoctdb-failover: omit "restrict" optimization keyword
Björn Baumbach [Tue, 2 Jul 2024 16:04:40 +0000 (18:04 +0200)] 
ctdb-failover: omit "restrict" optimization keyword

Fails with some compilers with

error: expected ';', ',' or ')' before 'lineptr'

Signed-off-by: Björn Baumbach <bb@sernet.de>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Tue Jul  2 23:52:37 UTC 2024 on atb-devel-224

13 months agoctdb/wscript: Remove long pending unsupported option
Anoop C S [Tue, 2 Jul 2024 05:27:28 +0000 (10:57 +0530)] 
ctdb/wscript: Remove long pending unsupported option

It has been a while since --with-libcephfs option was dropped. Therefore
stop advertising it through waf scripts.

Signed-off-by: Anoop C S <anoopcs@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Tue Jul  2 09:13:20 UTC 2024 on atb-devel-224

13 months agosource3/wscript: Remove long pending unsupported option
Anoop C S [Tue, 2 Jul 2024 05:26:45 +0000 (10:56 +0530)] 
source3/wscript: Remove long pending unsupported option

It has been a while since --with-libcephfs option was dropped. Therefore
stop advertising it through waf scripts.

Signed-off-by: Anoop C S <anoopcs@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
13 months agos3:smbd: Avoid compiler warning for unused label
Jo Sutton [Mon, 1 Jul 2024 03:55:13 +0000 (15:55 +1200)] 
s3:smbd: Avoid compiler warning for unused label

If either of HAVE_FSTATFS and HAVE_LINUX_MAGIC_H are not defined, gcc
produces the following error:

../../source3/smbd/open.c: In function ‘reopen_from_fsp’:
../../source3/smbd/open.c:1222:1: error: label ‘namebased_open’ defined but not used [-Werror=unused-label]
 1222 | namebased_open:
      | ^~~~~~~~~~~~~~

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Tue Jul  2 04:44:56 UTC 2024 on atb-devel-224

13 months agos4:dsdb: Remove unnecessary MIN()
Jo Sutton [Thu, 18 Jan 2024 02:16:36 +0000 (15:16 +1300)] 
s4:dsdb: Remove unnecessary MIN()

Since we have ensured that val->length >= sizeof(hash->hash),
MIN(val->length, sizeof(hash->hash)) will here always be equal to
sizeof(hash->hash).

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agolib:krb5_wrap: Fix code spelling
Jo Sutton [Wed, 17 Jan 2024 00:21:04 +0000 (13:21 +1300)] 
lib:krb5_wrap: Fix code spelling

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agos4:auth: Correct order of parameters in documentation
Jo Sutton [Tue, 16 Jan 2024 23:45:15 +0000 (12:45 +1300)] 
s4:auth: Correct order of parameters in documentation

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agos3:rpc_server: Fix code spelling
Jo Sutton [Mon, 15 Jan 2024 21:38:27 +0000 (10:38 +1300)] 
s3:rpc_server: Fix code spelling

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agolib:crypto: Remove unused macro definitions
Jo Sutton [Tue, 5 Dec 2023 02:40:30 +0000 (15:40 +1300)] 
lib:crypto: Remove unused macro definitions

As we now require GnuTLS 3.6.13, we can rely on GnuTLS providing these
macros.

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agoperftest:ndr_pack_performance: Remove obselete comment
Jo Sutton [Mon, 8 Jan 2024 04:22:39 +0000 (17:22 +1300)] 
perftest:ndr_pack_performance: Remove obselete comment

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agoperftest:ndr_pack_performance: Remove unused import
Jo Sutton [Mon, 8 Jan 2024 04:22:21 +0000 (17:22 +1300)] 
perftest:ndr_pack_performance: Remove unused import

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agos3:rpc_server: Update deprecated directives
Jo Sutton [Fri, 22 Dec 2023 00:35:26 +0000 (13:35 +1300)] 
s3:rpc_server: Update deprecated directives

‘api.prefix’ and ‘parse.error’ have both been supported since Bison 3.0.

/data/samba/source3/rpc_server/mdssvc/es_parser.y:98.1-21: warning: deprecated directive: ‘%name-prefix "mdsyyl"’, use ‘%define api.prefix {mdsyyl}’ [-Wdeprecated]
   98 | %name-prefix "mdsyyl"
      | ^~~~~~~~~~~~~~~~~~~~~
      | %define api.prefix {mdsyyl}
/data/samba/source3/rpc_server/mdssvc/es_parser.y:100.1-14: warning: deprecated directive: ‘%error-verbose’, use ‘%define parse.error verbose’ [-Wdeprecated]
  100 | %error-verbose
      | ^~~~~~~~~~~~~~
      | %define parse.error verbose
/data/samba/source3/rpc_server/mdssvc/es_parser.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agopyglue: Remove global variables used in only one place
Jo Sutton [Tue, 12 Dec 2023 04:38:02 +0000 (17:38 +1300)] 
pyglue: Remove global variables used in only one place

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agos4:dsdb: Use appropriate type for userAccountControl flags
Jo Sutton [Thu, 13 Jun 2024 22:43:07 +0000 (10:43 +1200)] 
s4:dsdb: Use appropriate type for userAccountControl flags

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agos4:auth: Use appropriate type for userAccountControl flags
Jo Sutton [Thu, 13 Jun 2024 22:42:51 +0000 (10:42 +1200)] 
s4:auth: Use appropriate type for userAccountControl flags

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agos3:param: Check return value of strlower_m() (CID 1598446)
Jo Sutton [Tue, 11 Jun 2024 03:10:02 +0000 (15:10 +1200)] 
s3:param: Check return value of strlower_m() (CID 1598446)

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agotests/krb5: Simplify code using dict.get()
Jo Sutton [Tue, 2 Jul 2024 02:55:45 +0000 (14:55 +1200)] 
tests/krb5: Simplify code using dict.get()

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agotests/krb5: Fix type errors by giving ‘pwd_last_set’ an appropriate type
Jo Sutton [Thu, 16 May 2024 02:41:17 +0000 (14:41 +1200)] 
tests/krb5: Fix type errors by giving ‘pwd_last_set’ an appropriate type

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>
13 months agoFix starvation of pending writes in CTDB queues
Xavi Hernandez [Thu, 27 Jun 2024 13:41:19 +0000 (15:41 +0200)] 
Fix starvation of pending writes in CTDB queues

CTDB uses a queue to receive requests and send answers. It works
asynchronously using the tevent framework. However there was an issue
that gave priority to the receiving side so, when a request was
processed and the answer posted to the queue, if another incoming
request arrived, it was served before sending the previous answer.

This scenario could repeat for long periods of time if the frequency of
incoming requests was high enough.

Eventually, a small time gap between incoming request gave a chance to
process the pending output queue, sending many answers in a burst.

This patch makes sure that both queues (input and output) are processed
if the event contains the appropriate flag.

Signed-off-by: Xavi Hernandez <xhernandez@redhat.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Mon Jul  1 09:17:43 UTC 2024 on atb-devel-224

13 months agos4:torture: Initialize param arrays
Andreas Schneider [Fri, 21 Jun 2024 11:36:23 +0000 (13:36 +0200)] 
s4:torture: Initialize param arrays

"Error: UNINIT (CWE-457):
samba-4.20.0rc2/source4/torture/gentest.c:2690: var_decl: Declaring variable ""parm"" without initializer.
samba-4.20.0rc2/source4/torture/gentest.c:2711: uninit_use: Using uninitialized value ""parm[0]"". Field ""parm[0].out"" is uninitialized.
 2709|    }
 2710|
 2711|->  GEN_COPY_PARM;
 2712|    GEN_SET_FNUM_SMB2(in.file.handle);
 2713|    GEN_CALL_SMB2(smb2_lock(tree, &parm[i]));"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Mon Jul  1 00:23:08 UTC 2024 on atb-devel-224

13 months agos4:torture: Remove trailing spaces from gentest.c
Andreas Schneider [Fri, 21 Jun 2024 11:37:46 +0000 (13:37 +0200)] 
s4:torture: Remove trailing spaces from gentest.c

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
13 months agos3:winbind: Fix integer type of len
Andreas Schneider [Fri, 21 Jun 2024 08:57:32 +0000 (10:57 +0200)] 
s3:winbind: Fix integer type of len

"Error: INTEGER_OVERFLOW (CWE-190):
samba-4.20.0rc2/source3/winbindd/winbindd_cache.c:849: cast_overflow: Truncation due to cast operation on ""len"" from 32 to 8 bits.
samba-4.20.0rc2/source3/winbindd/winbindd_cache.c:851: overflow_sink: ""len"", which might have overflowed, is passed to ""memcpy(centry->data + centry->ofs, s, len)"". [Note: The source code implementation of the function has been overridden by a builtin model.]
  849|    centry_put_uint8(centry, len);
  850|    centry_expand(centry, len);
  851|->  memcpy(centry->data + centry->ofs, s, len);
  852|    centry->ofs += len;
  853|   }"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
13 months agos3:smbd: Make sure struct security_ace is initialized
Andreas Schneider [Fri, 21 Jun 2024 08:49:53 +0000 (10:49 +0200)] 
s3:smbd: Make sure struct security_ace is initialized

"Error: UNINIT (CWE-457):
samba-4.20.0rc2/source3/smbd/posix_acls.c:4706: var_decl: Declaring variable ""aces"" without initializer.
samba-4.20.0rc2/source3/smbd/posix_acls.c:4748: uninit_use_in_call: Using uninitialized value ""*aces"". Field ""aces->object"" is uninitialized when calling ""make_sec_acl"".
 4746|    idx++;
 4747|
 4748|->  new_dacl = make_sec_acl(ctx,
 4749|    NT4_ACL_REVISION,
 4750|    idx,"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
13 months agos3:libsmb: Check if we have a valid file descriptor
Andreas Schneider [Fri, 21 Jun 2024 08:48:01 +0000 (10:48 +0200)] 
s3:libsmb: Check if we have a valid file descriptor

"Error: REVERSE_NEGATIVE (CWE-191):
samba-4.20.0rc2/source3/libsmb/pylibsmb.c:215: negative_sink_in_call: Passing ""t->shutdown_pipe[1]"" to a parameter that cannot be negative.
samba-4.20.0rc2/source3/libsmb/pylibsmb.c:230: check_after_sink: You might be using variable ""t->shutdown_pipe[1]"" before verifying that it is >= 0.
  228|    t->shutdown_pipe[0] = -1;
  229|    }
  230|->  if (t->shutdown_pipe[1] != -1) {
  231|    close(t->shutdown_pipe[1]);
  232|    t->shutdown_pipe[1] = -1;"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
13 months agos4:torture: Initialize pointers
Andreas Schneider [Fri, 21 Jun 2024 08:45:23 +0000 (10:45 +0200)] 
s4:torture: Initialize pointers

"Error: UNINIT (CWE-457):
samba-4.20.0rc2/source4/torture/smb2/durable_open.c:1518: var_decl: Declaring variable ""tree2"" without initializer.
samba-4.20.0rc2/source4/torture/smb2/durable_open.c:1584: uninit_use_in_call: Using uninitialized value ""tree2"" when calling ""smb2_util_close"".
 1582|    if (tree != NULL) {
 1583|    if (h != NULL) {
 1584|->  smb2_util_close(tree2, *h);
 1585|    }
 1586|"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
13 months agos4:torture: Initialize struct smb2_handle
Andreas Schneider [Thu, 20 Jun 2024 12:48:29 +0000 (14:48 +0200)] 
s4:torture: Initialize struct smb2_handle

"Error: UNINIT (CWE-457):
samba-4.20.0rc2/source4/torture/smb2/lease.c:452: var_decl: Declaring variable ""h"" without initializer.
samba-4.20.0rc2/source4/torture/smb2/lease.c:516: uninit_use_in_call: Using uninitialized value ""h"" when calling ""smb2_util_close"".
  514|
  515|    done:
  516|->  smb2_util_close(tree, h);
  517|    smb2_util_close(tree, hnew);
  518|    smb2_util_close(tree, h2);"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
13 months agos4:torture: Initialize struct netr_LogonSamLogonEx
Andreas Schneider [Thu, 20 Jun 2024 12:44:33 +0000 (14:44 +0200)] 
s4:torture: Initialize struct netr_LogonSamLogonEx

"Error: UNINIT (CWE-457):
samba-4.20.0rc2/source4/torture/rpc/schannel.c:250: var_decl: Declaring variable ""r"" without initializer.
samba-4.20.0rc2/source4/torture/rpc/schannel.c:357: uninit_use_in_call: Using uninitialized value ""r.in.validation_level"" when calling ""torture_comment"".
  355|    ""LogonSamLogonEx failed"");
  356|    } else {
  357|->  torture_comment(tctx,
  358|    ""Skip auth_level[%u] Testing LogonSamLogonEx with name %s using %s and validation_level: %d\n"",
  359|    auth_level, ninfo.identity_info.account_name.string, crypto_alg,"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
13 months agos3:rpc_client: Initialize struct security_ace
Andreas Schneider [Thu, 20 Jun 2024 12:42:54 +0000 (14:42 +0200)] 
s3:rpc_client: Initialize struct security_ace

"Error: UNINIT (CWE-457):
samba-4.20.0rc2/source3/rpc_client/init_spoolss.c:348: var_decl: Declaring variable ""ace"" without initializer.
samba-4.20.0rc2/source3/rpc_client/init_spoolss.c:415: uninit_use_in_call: Using uninitialized value ""*ace"". Field ""ace->object"" is uninitialized when calling ""make_sec_acl"".
  413|       NT5 machine. */
  414|
  415|->  if ((psa = make_sec_acl(mem_ctx, NT4_ACL_REVISION, i, ace)) != NULL) {
  416|    psd = make_sec_desc(mem_ctx,
  417|        SD_REVISION,"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
13 months agos4:torture: Make sure struct smb2_handle is initialized
Andreas Schneider [Thu, 20 Jun 2024 07:24:12 +0000 (09:24 +0200)] 
s4:torture: Make sure struct smb2_handle is initialized

"Error: UNINIT (CWE-457):
samba-4.20.0rc2/source4/torture/smb2/lease.c:1223: var_decl: Declaring variable ""h2"" without initializer.
samba-4.20.0rc2/source4/torture/smb2/lease.c:1328: uninit_use_in_call: Using uninitialized value ""h2"" when calling ""smb2_util_close"".
 1326|    done:
 1327|    smb2_util_close(tree, h);
 1328|->  smb2_util_close(tree, h2);
 1329|
 1330|    smb2_util_unlink(tree, fname);"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
13 months agos3:smbd: Make sure struct security_ace is initialized
Andreas Schneider [Thu, 20 Jun 2024 07:14:45 +0000 (09:14 +0200)] 
s3:smbd: Make sure struct security_ace is initialized

"Error: UNINIT (CWE-457):
samba-4.20.0rc2/source3/smbd/posix_acls.c:4778: var_decl: Declaring variable ""aces"" without initializer.
samba-4.20.0rc2/source3/smbd/posix_acls.c:4799: uninit_use_in_call: Using uninitialized value ""*aces"". Field ""aces->object"" is uninitialized when calling ""make_sec_acl"".
 4797|    idx++;
 4798|
 4799|->  new_dacl = make_sec_acl(ctx,
 4800|    NT4_ACL_REVISION,
 4801|    idx,"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
13 months agos3:smbd: Remove trailing spaces in posix_acls.c
Andreas Schneider [Thu, 20 Jun 2024 07:14:20 +0000 (09:14 +0200)] 
s3:smbd: Remove trailing spaces in posix_acls.c

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
13 months agoexamples: Make sure the array is probably initialized
Andreas Schneider [Thu, 20 Jun 2024 07:12:22 +0000 (09:12 +0200)] 
examples: Make sure the array is probably initialized

"Error: UNINIT (CWE-457):
samba-4.20.0rc2/examples/libsmbclient/testacl2.c:27: var_decl: Declaring variable ""value"" without initializer.
samba-4.20.0rc2/examples/libsmbclient/testacl2.c:48: uninit_use_in_call: Using uninitialized value ""*value"" as argument to ""%s"" when calling ""printf"". [Note: The source code implementation of the function has been overridden by a builtin model.]
   46|    }
   47|
   48|->  printf(""Attributes for [%s] are:\n%s\n"", argv[1], value);
   49|
   50|    flags = 0;"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
13 months agowinexe: Make sure specificError is initialized
Andreas Schneider [Thu, 20 Jun 2024 07:08:48 +0000 (09:08 +0200)] 
winexe: Make sure specificError is initialized

"Error: UNINIT (CWE-457):
samba-4.20.0rc2/examples/winexe/winexesvc.c:684: var_decl: Declaring variable ""specificError"" without initializer.
samba-4.20.0rc2/examples/winexe/winexesvc.c:711: uninit_use: Using uninitialized value ""specificError"".
  709|    winexesvcStatus.dwWaitHint = 0;
  710|    winexesvcStatus.dwWin32ExitCode = status;
  711|->  winexesvcStatus.dwServiceSpecificExitCode = specificError;
  712|
  713|    SetServiceStatus(winexesvcStatusHandle, &winexesvcStatus);"

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
13 months agosmbd: Fix cached dos attributes
Volker Lendecke [Mon, 24 Jun 2024 14:50:57 +0000 (16:50 +0200)] 
smbd: Fix cached dos attributes

The callers of fset_dos_mode must set the cached attributes
themselves, which I did not see. I tried, but I did not find a clean
way to fix this behind SMB_VFS_FSET_DOS_ATTRIBUTES, with a smb_fname
and smb_fname->fsp->fsp_name we might have two copies of the cached
dos attributes around and if we only update fsp->fsp_name, we might
miss the outer one.

Not doing a test, this is really fresh code, and in the future we must
reorganize setting and caching dos attributes anyway.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Fri Jun 28 14:32:27 UTC 2024 on atb-devel-224

13 months agolibrpc: Make NDR_PRINT_DEBUG call just one DEBUG
Volker Lendecke [Mon, 17 Jun 2024 12:42:30 +0000 (14:42 +0200)] 
librpc: Make NDR_PRINT_DEBUG call just one DEBUG

Give debug.c the chance to use just one write call (right now it
doesn't yet)

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Simplify smbd_do_qfsinfo with direct struct initialization
Volker Lendecke [Thu, 27 Jun 2024 10:50:50 +0000 (12:50 +0200)] 
smbd: Simplify smbd_do_qfsinfo with direct struct initialization

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Simplify reopen_from_fsp
Volker Lendecke [Wed, 26 Jun 2024 13:30:50 +0000 (15:30 +0200)] 
smbd: Simplify reopen_from_fsp

In a variable declaration the (struct ...) is not needed

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Remove some unused code
Volker Lendecke [Wed, 26 Jun 2024 06:57:26 +0000 (08:57 +0200)] 
smbd: Remove some unused code

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Avoid a cast
Volker Lendecke [Tue, 25 Jun 2024 14:11:16 +0000 (16:11 +0200)] 
smbd: Avoid a cast

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Print reparse_point in dos_mode_debug_print
Volker Lendecke [Tue, 25 Jun 2024 14:10:28 +0000 (16:10 +0200)] 
smbd: Print reparse_point in dos_mode_debug_print

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Simplify dos_mode_from_sbuf
Volker Lendecke [Tue, 25 Jun 2024 14:07:58 +0000 (16:07 +0200)] 
smbd: Simplify dos_mode_from_sbuf

We don't need that else branch, this could be a switch as well

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Simplify fdos_mode
Volker Lendecke [Tue, 25 Jun 2024 14:04:53 +0000 (16:04 +0200)] 
smbd: Simplify fdos_mode

We don't need the outer !NT_STATUS_IS_OK and the comment

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Simplify filename_convert_dirfsp_nosymlink
Volker Lendecke [Tue, 25 Jun 2024 13:49:23 +0000 (15:49 +0200)] 
smbd: Simplify filename_convert_dirfsp_nosymlink

Initialize the timestamps in the existing struct assignment

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Remove an obsolete comment
Volker Lendecke [Tue, 25 Jun 2024 11:08:58 +0000 (13:08 +0200)] 
smbd: Remove an obsolete comment

We have a good understanding of SAMBA_UTIME_OMIT these days

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Simplify init_smb_file_time
Volker Lendecke [Tue, 25 Jun 2024 11:06:35 +0000 (13:06 +0200)] 
smbd: Simplify init_smb_file_time

Call make_omit_timespec just once, saves a few .text bytes

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Simplify copy_stat_ex_timestamps
Volker Lendecke [Tue, 25 Jun 2024 10:39:09 +0000 (12:39 +0200)] 
smbd: Simplify copy_stat_ex_timestamps

copy_stat_ex_timestamps doesn't need the fsp, it only needs the
destination stat struct

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Modernize a DEBUG
Volker Lendecke [Tue, 25 Jun 2024 08:41:41 +0000 (10:41 +0200)] 
smbd: Modernize a DEBUG

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agovfs: Fix typos
Volker Lendecke [Tue, 25 Jun 2024 08:28:38 +0000 (10:28 +0200)] 
vfs: Fix typos

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Don't leave a pointer variable uninitialized
Volker Lendecke [Mon, 24 Jun 2024 14:52:51 +0000 (16:52 +0200)] 
smbd: Don't leave a pointer variable uninitialized

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
13 months agosmbd: Align an integer type
Volker Lendecke [Mon, 24 Jun 2024 14:51:08 +0000 (16:51 +0200)] 
smbd: Align an integer type

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>