d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always free dynamically allocated memory before returning.

Browse Source 
CID:		1007418
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
markj 2018-10-24 16:46:26 +00:00
parent ac2a239a60
commit aa74fd1051
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
usr.sbin/rtsold/rtsold.c
View File

@ -334,16 +334,16 @@ ifconfig(char *ifname)
struct sockaddr_dl *sdl;
int flags;
ifi = NULL;
if ((sdl = if_nametosdl(ifname)) == NULL) {
warnmsg(LOG_ERR, __func__,
"failed to get link layer information for %s", ifname);
return (-1);
goto bad;
}
if (find_ifinfo(sdl->sdl_index)) {
warnmsg(LOG_ERR, __func__,
"interface %s was already configured", ifname);
free(sdl);
return (-1);
goto bad;
}
if (Fflag) {
@ -352,30 +352,29 @@ ifconfig(char *ifname)
if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
warnmsg(LOG_ERR, __func__, "socket() failed.");
return (-1);
goto bad;
}
memset(&nd, 0, sizeof(nd));
strlcpy(nd.ifname, ifname, sizeof(nd.ifname));
if (ioctl(s, SIOCGIFINFO_IN6, (caddr_t)&nd) < 0) {
warnmsg(LOG_ERR, __func__,
"cannot get accept_rtadv flag");
close(s);
return (-1);
(void)close(s);
goto bad;
}
nd.ndi.flags |= ND6_IFF_ACCEPT_RTADV;
if (ioctl(s, SIOCSIFINFO_IN6, (caddr_t)&nd) < 0) {
warnmsg(LOG_ERR, __func__,
"cannot set accept_rtadv flag");
close(s);
return (-1);
(void)close(s);
goto bad;
}
close(s);
(void)close(s);
}
if ((ifi = malloc(sizeof(*ifi))) == NULL) {
warnmsg(LOG_ERR, __func__, "memory allocation failed");
free(sdl);
return (-1);
goto bad;
}
memset(ifi, 0, sizeof(*ifi));
ifi->sdl = sdl;
@ -426,7 +425,7 @@ ifconfig(char *ifname)
return (0);
bad:
free(ifi->sdl);
free(sdl);
free(ifi);
return (-1);
}