jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-30 04:22:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

route: avoid overlapping strcpy

Browse Source 
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
This commit is contained in:
Kyle Evans 2024-07-23 15:25:46 -05:00
parent a90b9d0159
commit 158f319428
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sbin/route/route.c
View File

@ -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". */