From 635a2c892cef4b0cff57f77264b5e821e04425e2 Mon Sep 17 00:00:00 2001 From: Marcelo Araujo Date: Fri, 25 May 2018 18:54:40 +0000 Subject: [PATCH] After a long discussion about assert(3), we gonna use a HardenedBSD approach to chek strdup(3) memory allocation. Submitted by: Shaw Webb Reported by: brooks Obtained from: HardenedBSD --- usr.sbin/bhyve/bhyverun.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 6e813a10001e..3363446c43a4 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -193,7 +193,8 @@ topology_parse(const char *opt) c = 1, n = 1, s = 1, t = 1; ns = false, scts = false; str = strdup(opt); - assert(str != NULL); + if (str == NULL) + goto out; while ((cp = strsep(&str, ",")) != NULL) { if (sscanf(cp, "%i%n", &tmp, &chk) == 1) { @@ -225,6 +226,7 @@ topology_parse(const char *opt) goto out; } free(str); + str = NULL; /* * Range check 1 <= n <= UINT16_MAX all values @@ -253,7 +255,8 @@ topology_parse(const char *opt) return(0); out: - free(str); + if (str != NULL) + free(str); return (-1); }