summaryrefslogtreecommitdiff
path: root/security/heimdal-devel/files/patch-lib_kadm5_marshall.c
diff options
context:
space:
mode:
Diffstat (limited to 'security/heimdal-devel/files/patch-lib_kadm5_marshall.c')
-rw-r--r--security/heimdal-devel/files/patch-lib_kadm5_marshall.c32
1 files changed, 30 insertions, 2 deletions
diff --git a/security/heimdal-devel/files/patch-lib_kadm5_marshall.c b/security/heimdal-devel/files/patch-lib_kadm5_marshall.c
index 8cc79bafcc8c..8bc63095693f 100644
--- a/security/heimdal-devel/files/patch-lib_kadm5_marshall.c
+++ b/security/heimdal-devel/files/patch-lib_kadm5_marshall.c
@@ -1,7 +1,14 @@
--- lib/kadm5/marshall.c.orig 2022-11-17 16:55:32.000000000 -0800
-+++ lib/kadm5/marshall.c 2022-11-24 08:17:04.255672000 -0800
-@@ -465,8 +465,12 @@
++++ lib/kadm5/marshall.c 2022-11-24 08:47:49.092069000 -0800
+@@ -463,10 +463,40 @@
+ ret = krb5_ret_int32(sp, &mask);
+ if (ret)
goto out;
++ if (mask & KADM5_CONFIG_REALM & KADM5_CONFIG_DBNAME
++ & KADM5_CONFIG_ACL_FILE & KADM5_CONFIG_STASH_FILE) {
++ ret = EINVAL;
++ goto out;
++ }
params->mask = mask;
- if(params->mask & KADM5_CONFIG_REALM)
@@ -9,6 +16,27 @@
ret = krb5_ret_string(sp, &params->realm);
+ if (params->realm == NULL) {
+ ret = EINVAL;
++ goto out;
++ }
++ }
++ if (params->mask & KADM5_CONFIG_DBNAME) {
++ ret = krb5_ret_string(sp, &params->dbname);
++ if (params->dbname == NULL) {
++ ret = EINVAL;
++ goto out;
++ }
++ }
++ if (params->mask & KADM5_CONFIG_ACL_FILE) {
++ ret = krb5_ret_string(sp, &params->acl_file);
++ if (params->acl_file == NULL) {
++ ret = EINVAL;
++ goto out;
++ }
++ }
++ if (params->mask & KADM5_CONFIG_STASH_FILE) {
++ ret = krb5_ret_string(sp, &params->stash_file);
++ if (params->stash_file == NULL) {
++ ret = EINVAL;
+ }
+ }
out: