]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbd: Fix a few possible buffer read overruns
authorVolker Lendecke <vl@samba.org>
Sat, 13 Sep 2025 07:11:39 +0000 (09:11 +0200)
committerVolker Lendecke <vl@samba.org>
Mon, 10 Nov 2025 13:29:30 +0000 (13:29 +0000)
... only happens with invalid smb.conf settings....

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>
lib/param/param_table.c
source3/modules/vfs_nfs4acl_xattr.c
source3/smbd/posix_acls.c

index 04d4d1dac8490fbc3c0a640e3f1ea56ccf657b6e..98fc3e5d103d81cdc88b0e2a38ca749f34dd4456 100644 (file)
@@ -368,7 +368,8 @@ static const struct enum_list enum_ldap_deref[] = {
        {SAMBA_LDAP_DEREF_SEARCHING, "searching"},
        {SAMBA_LDAP_DEREF_FINDING, "finding"},
        {SAMBA_LDAP_DEREF_ALWAYS, "always"},
-       {-1, "auto"}
+       {-1, "auto"},
+       {-1, NULL},
 };
 
 static const struct enum_list enum_ldap_passwd_sync[] = {
@@ -434,6 +435,7 @@ static const struct enum_list enum_nt_hash_store[] = {
        {NT_HASH_STORE_AUTO, "auto"},
        {NT_HASH_STORE_NEVER, "never"},
        {NT_HASH_STORE_ALWAYS, "always"},
+       {-1, NULL},
 };
 
 
index fb2d2bc407ba25a21a92f3f7186bda20b3391bf1..78cd2122ba3b31d159f3af8ed5e481af20513bd2 100644 (file)
@@ -45,6 +45,7 @@ static const struct enum_list nfs4acl_encoding[] = {
        {NFS4ACL_ENCODING_NDR, "ndr"},
        {NFS4ACL_ENCODING_XDR, "xdr"},
        {NFS4ACL_ENCODING_NFS, "nfs"},
+       {-1, NULL},
 };
 
 /*
index 47d310a946eb587824aa940c8f8380b71964b436..82a70f82ea63b589e3a2ca47c0411e24111c2f75 100644 (file)
@@ -4825,6 +4825,7 @@ static const struct enum_list default_acl_style_list[] = {
        {DEFAULT_ACL_POSIX,     "posix"},
        {DEFAULT_ACL_WINDOWS,   "windows"},
        {DEFAULT_ACL_EVERYONE,  "everyone"},
+       {-1, NULL},
 };
 
 const struct enum_list *get_default_acl_style_list(void)