From: Noel Power <noel.power@suse.com>
Date: Wed, 15 Nov 2023 12:55:36 +0000 (+0000)
Subject: s3/utils: Detect (and report) failure to parse sddl
X-Git-Tag: talloc-2.4.2~672
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b319769ebd1caf4a406211f62cf6086ad3057672;p=thirdparty%2Fsamba.git

s3/utils: Detect (and report) failure to parse sddl

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 0575a254c29..0316868fb3d 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -2108,6 +2108,11 @@ static int cacl_restore(struct cli_state *cli,
 			}
 		} else {
 			entries[index].sd = sddl_decode(lines, lines[i], sid);
+			if(entries[index].sd == NULL) {
+				DBG_ERR("could not decode '%s'\n", lines[i]);
+				result = EXIT_FAILED;
+				goto out;
+			}
 			entries[index].sd->type |=
 			    SEC_DESC_DACL_AUTO_INHERIT_REQ;
 			entries[index].sd->type |= SEC_DESC_SACL_AUTO_INHERITED;