summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2016-12-06 18:49:48 +0000
committerglebius <glebius@FreeBSD.org>2016-12-06 18:49:48 +0000
commit7039a85a068b696972fcc41b36349977d9889a9a (patch)
tree9e1428b58013365e340bfb13bda0891a8e9149ce /contrib
parente0d95c380e7a6c1d929bc17b18aa2cd374506980 (diff)
downloadFreeBSD-src-7039a85a068b696972fcc41b36349977d9889a9a.zip
FreeBSD-src-7039a85a068b696972fcc41b36349977d9889a9a.tar.gz
Fix possible login(1) argument injection in telnetd(8). [SA-16:36]
Fix link_ntoa(3) buffer overflow in libc. [SA-16:37] Fix possible escape from bhyve(8) virtual machine. [SA-16:38] Fix warnings about valid time zone abbreviations. [EN-16:19] Update timezone database information. [EN-16:20] Security: FreeBSD-SA-16:36.telnetd Security: FreeBSD-SA-16:37.libc Security: FreeBSD-SA-16:38.bhyve Errata Notice: FreeBSD-EN-16:19.tzcode Errata Notice: FreeBSD-EN-16:20.tzdata Approved by: so
Diffstat (limited to 'contrib')
-rw-r--r--contrib/telnet/telnetd/sys_term.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/telnet/telnetd/sys_term.c b/contrib/telnet/telnetd/sys_term.c
index f9b9461..a2e551f 100644
--- a/contrib/telnet/telnetd/sys_term.c
+++ b/contrib/telnet/telnetd/sys_term.c
@@ -1159,7 +1159,7 @@ addarg(char **argv, const char *val)
*/
argv = (char **)malloc(sizeof(*argv) * 12);
if (argv == NULL)
- return(NULL);
+ fatal(net, "failure allocating argument space");
*argv++ = (char *)10;
*argv = (char *)0;
}
@@ -1170,11 +1170,12 @@ addarg(char **argv, const char *val)
*argv = (char *)((long)(*argv) + 10);
argv = (char **)realloc(argv, sizeof(*argv)*((long)(*argv) + 2));
if (argv == NULL)
- return(NULL);
+ fatal(net, "failure allocating argument space");
argv++;
cpp = &argv[(long)argv[-1] - 10];
}
- *cpp++ = strdup(val);
+ if ((*cpp++ = strdup(val)) == NULL)
+ fatal(net, "failure allocating argument space");
*cpp = 0;
return(argv);
}
OpenPOWER on IntegriCloud