mirror of
https://git.freebsd.org/ports.git
synced 2025-05-25 07:26:29 -04:00
8cafd5bc0d
In addition to garbage realm data, also handle garbage dbname, acl_file, stash_file, and invalid bitmask garbage data. PR: 267912 Reported by: Robert Morris <rtm@lcs.mit.edu> MFH: 2022Q4
44 lines
1.1 KiB
C
44 lines
1.1 KiB
C
--- lib/kadm5/marshall.c.orig 2022-09-15 16:54:19.000000000 -0700
|
|
+++ lib/kadm5/marshall.c 2022-11-24 08:47:40.099673000 -0800
|
|
@@ -407,10 +407,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)
|
|
+ if (params->mask & KADM5_CONFIG_REALM) {
|
|
ret = krb5_ret_string(sp, ¶ms->realm);
|
|
+ if (params->realm == NULL) {
|
|
+ ret = EINVAL;
|
|
+ goto out;
|
|
+ }
|
|
+ }
|
|
+ if (params->mask & KADM5_CONFIG_DBNAME) {
|
|
+ ret = krb5_ret_string(sp, ¶ms->dbname);
|
|
+ if (params->dbname == NULL) {
|
|
+ ret = EINVAL;
|
|
+ goto out;
|
|
+ }
|
|
+ }
|
|
+ if (params->mask & KADM5_CONFIG_ACL_FILE) {
|
|
+ ret = krb5_ret_string(sp, ¶ms->acl_file);
|
|
+ if (params->acl_file == NULL) {
|
|
+ ret = EINVAL;
|
|
+ goto out;
|
|
+ }
|
|
+ }
|
|
+ if (params->mask & KADM5_CONFIG_STASH_FILE) {
|
|
+ ret = krb5_ret_string(sp, ¶ms->stash_file);
|
|
+ if (params->stash_file == NULL) {
|
|
+ ret = EINVAL;
|
|
+ }
|
|
+ }
|
|
out:
|
|
krb5_storage_free(sp);
|
|
|