From: Volker Lendecke <vl@samba.org>
Date: Sat, 13 Sep 2025 07:11:39 +0000 (+0200)
Subject: smbd: Fix a few possible buffer read overruns
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd049cd50aed17759570e312970a2ef60059f32c;p=thirdparty%2Fsamba.git

smbd: Fix a few possible buffer read overruns

... only happens with invalid smb.conf settings....

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>
---

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 04d4d1dac84..98fc3e5d103 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -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},
 };
 
 
diff --git a/source3/modules/vfs_nfs4acl_xattr.c b/source3/modules/vfs_nfs4acl_xattr.c
index fb2d2bc407b..78cd2122ba3 100644
--- a/source3/modules/vfs_nfs4acl_xattr.c
+++ b/source3/modules/vfs_nfs4acl_xattr.c
@@ -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},
 };
 
 /*
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 47d310a946e..82a70f82ea6 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -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)