diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2024-07-23 20:25:46 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2024-07-23 20:25:56 +0000 |
| commit | 158f319428c10143ce2ffe766416207c75578931 (patch) | |
| tree | 927260850d611d434b1db7beafa48e26ef40a398 | |
| parent | a90b9d0159070121c221b966469c3e36d912bf82 (diff) | |
| download | src-158f319428c10143ce2ffe766416207c75578931.tar.gz src-158f319428c10143ce2ffe766416207c75578931.zip | |
route: avoid overlapping strcpy
Passing overlapping buffers to strcpy yields an undefined result, so
let's avoid it. The copy doesn't really need to happen anyways, we can
just point to the domain part of the hostname.
This was discovered with _FORTIFY_SOURCE.
Sponsored by: Klara, Inc.
Sponsored by: Stormshield
Reviewed by: allanjude, emaste, imp, melifaro (all previous version)
Differential Revision: https://reviews.freebsd.org/D32615
| -rw-r--r-- | sbin/route/route.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sbin/route/route.c b/sbin/route/route.c index 03844308fe84..cea63df3aa11 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -94,8 +94,8 @@ static u_long rtm_inits; static uid_t uid; static int defaultfib; static int numfibs; -static char domain[MAXHOSTNAMELEN + 1]; -static bool domain_initialized; +static char domain_storage[MAXHOSTNAMELEN + 1]; +static const char *domain; static char rt_line[NI_MAXHOST]; static char net_line[MAXHOSTNAMELEN + 1]; @@ -581,14 +581,16 @@ routename(struct sockaddr *sa) const char *cp; int n; - if (!domain_initialized) { - domain_initialized = true; - if (gethostname(domain, MAXHOSTNAMELEN) == 0 && - (cp = strchr(domain, '.'))) { - domain[MAXHOSTNAMELEN] = '\0'; - (void)strcpy(domain, cp + 1); - } else - domain[0] = '\0'; + if (domain == NULL) { + if (gethostname(domain_storage, + sizeof(domain_storage) - 1) == 0 && + (cp = strchr(domain_storage, '.')) != NULL) { + domain_storage[sizeof(domain_storage) - 1] = '\0'; + domain = cp + 1; + } else { + domain_storage[0] = '\0'; + domain = domain_storage; + } } /* If the address is zero-filled, use "default". */ |