diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-04-09 14:48:23 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-04-10 13:58:10 -0400 |
| commit | 5b48c74845df82b3ae5a2f7cb8e64c521583e373 (patch) | |
| tree | bc6ace79d613ddd34570ef8524002709a2876485 | |
| parent | 0f93db1b5bd0c2aac98945b8a8f1564ede632de0 (diff) | |
| download | krb5-5b48c74845df82b3ae5a2f7cb8e64c521583e373.tar.gz krb5-5b48c74845df82b3ae5a2f7cb8e64c521583e373.tar.xz krb5-5b48c74845df82b3ae5a2f7cb8e64c521583e373.zip | |
Tighten up fixed buffer usage in hst_realm.c
Avoid or notice truncations, rather than letting them happen silently.
| -rw-r--r-- | src/lib/krb5/os/hst_realm.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c index a01efc34cb..3bcc7923cc 100644 --- a/src/lib/krb5/os/hst_realm.c +++ b/src/lib/krb5/os/hst_realm.c @@ -110,7 +110,8 @@ krb5int_get_fq_local_hostname(char *buf, size_t bufsize) freeaddrinfo(ai); return KRB5_EAI_FAIL; } - strlcpy(buf, ai->ai_canonname, bufsize); + if (strlcpy(buf, ai->ai_canonname, bufsize) >= bufsize) + return ENOMEM; freeaddrinfo(ai); return 0; } @@ -277,20 +278,20 @@ krb5_error_code KRB5_CALLCONV krb5_get_fallback_host_realm(krb5_context context, krb5_data *hdata, char ***realmsp) { - char **retrealms, *p, *realm = NULL; + char **retrealms, *p, *realm = NULL, *host, cleanname[MAXDNAME + 1]; krb5_error_code ret; - char cleanname[MAXDNAME + 1], host[MAXDNAME + 1]; int limit; errcode_t code; krb5_boolean is_numeric; *realmsp = NULL; - /* Convert what we hope is a hostname to a string. */ - memcpy(host, hdata->data, hdata->length); - host[hdata->length] = '\0'; - + /* Convert hdata into a string and clean it up. */ + host = k5memdup0(hdata->data, hdata->length, &ret); + if (host == NULL) + return ret; ret = k5_clean_hostname(context, host, cleanname, sizeof(cleanname)); + free(host); if (ret) return ret; is_numeric = is_numeric_address(cleanname); @@ -382,8 +383,8 @@ k5_clean_hostname(krb5_context context, const char *host, char *cleanname, cleanname[0] = '\0'; if (host) { - /* Should probably error out if strlen(host) > MAXDNAME. */ - strlcpy(cleanname, host, lhsize); + if (strlcpy(cleanname, host, lhsize) >= lhsize) + return ENOMEM; } else { ret = krb5int_get_fq_local_hostname(cleanname, lhsize); if (ret) |