Author: trasz
Date: Mon Sep 15 16:40:27 2014
New Revision: 271632
URL: http://svnweb.freebsd.org/changeset/base/271632
Log:
MFC r271187:
Avoid ctld(8) crash on getaddrinfo(3) failure.
Approved by: re (gjb)
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/usr.sbin/ctld/ctld.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/ctld/ctld.c
==============================================================================
--- stable/10/usr.sbin/ctld/ctld.c Mon Sep 15 15:49:29 2014
(r271631)
+++ stable/10/usr.sbin/ctld/ctld.c Mon Sep 15 16:40:27 2014
(r271632)
@@ -561,8 +561,10 @@ portal_new(struct portal_group *pg)
static void
portal_delete(struct portal *portal)
{
+
TAILQ_REMOVE(&portal->p_portal_group->pg_portals, portal, p_next);
- freeaddrinfo(portal->p_ai);
+ if (portal->p_ai != NULL)
+ freeaddrinfo(portal->p_ai);
free(portal->p_listen);
free(portal);
}
@@ -633,8 +635,7 @@ portal_group_add_listen(struct portal_gr
arg = portal->p_listen;
if (arg[0] == '\0') {
log_warnx("empty listen address");
- free(portal->p_listen);
- free(portal);
+ portal_delete(portal);
return (1);
}
if (arg[0] == '[') {
@@ -646,8 +647,7 @@ portal_group_add_listen(struct portal_gr
if (arg == NULL) {
log_warnx("invalid listen address %s",
portal->p_listen);
- free(portal->p_listen);
- free(portal);
+ portal_delete(portal);
return (1);
}
if (arg[0] == '\0') {
@@ -657,8 +657,7 @@ portal_group_add_listen(struct portal_gr
} else {
log_warnx("invalid listen address %s",
portal->p_listen);
- free(portal->p_listen);
- free(portal);
+ portal_delete(portal);
return (1);
}
} else {
@@ -691,8 +690,7 @@ portal_group_add_listen(struct portal_gr
if (error != 0) {
log_warnx("getaddrinfo for %s failed: %s",
portal->p_listen, gai_strerror(error));
- free(portal->p_listen);
- free(portal);
+ portal_delete(portal);
return (1);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
