isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In set_interfaces() treat a parse error as fatal.

Browse Source
This commit is contained in:
Todd C. Miller
2016-12-03 16:39:43 -07:00
parent e8f612ead4
commit c62b7dc2ee
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/sudoers/interfaces.c
View File

@@ -47,7 +47,8 @@ static struct interface_list interfaces;
/* /*
* Parse a space-delimited list of IP address/netmask pairs and * Parse a space-delimited list of IP address/netmask pairs and
* store in a list of interface structures. * store in a list of interface structures. Returns true on
* success and false on parse error or memory allocation error.
*/ */
bool bool
set_interfaces(const char *ai) set_interfaces(const char *ai)
@@ -67,28 +68,39 @@ set_interfaces(const char *ai)
/* Parse addr and store in list. */ /* Parse addr and store in list. */
if ((ifp = calloc(1, sizeof(*ifp))) == NULL) { if ((ifp = calloc(1, sizeof(*ifp))) == NULL) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
"unable to allocate memory");
goto done; goto done;
} }
if (strchr(addr, ':')) { if (strchr(addr, ':')) {
/* IPv6 */ /* IPv6 */
#ifdef HAVE_STRUCT_IN6_ADDR #ifdef HAVE_STRUCT_IN6_ADDR
ifp->family = AF_INET6; ifp->family = AF_INET6;
if (inet_pton(AF_INET6, addr, &ifp->addr.ip6) != 1 || if (inet_pton(AF_INET6, addr, &ifp->addr.ip6) != 1) {
inet_pton(AF_INET6, mask, &ifp->netmask.ip6) != 1) sudo_warnx(U_("unable to parse IP address \"%s\""), addr);
#endif free(ifp);
{ goto done;
}
if (inet_pton(AF_INET6, mask, &ifp->netmask.ip6) != 1) {
sudo_warnx(U_("unable to parse netmask \"%s\""), mask);
free(ifp);
goto done;
}
#else
free(ifp); free(ifp);
continue; continue;
} #endif
} else { } else {
/* IPv4 */ /* IPv4 */
ifp->family = AF_INET; ifp->family = AF_INET;
if (inet_pton(AF_INET, addr, &ifp->addr.ip4) != 1 || if (inet_pton(AF_INET, addr, &ifp->addr.ip4) != 1) {
inet_pton(AF_INET, mask, &ifp->netmask.ip4) != 1) { sudo_warnx(U_("unable to parse IP address \"%s\""), addr);
free(ifp); free(ifp);
continue; goto done;
}
if (inet_pton(AF_INET, mask, &ifp->netmask.ip4) != 1) {
sudo_warnx(U_("unable to parse netmask \"%s\""), mask);
free(ifp);
goto done;
} }
} }
SLIST_INSERT_HEAD(&interfaces, ifp, entries); SLIST_INSERT_HEAD(&interfaces, ifp, entries);