redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: usbip: userspace: avoid memory leaks

Browse source 
Call freeaddrinfo when connect/listen fails.
Call usbip_host_driver_close on error.

Signed-off-by: Stefan Reif <ke42caxa@cip.cs.fau.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Stefan Reif 2013-04-04 16:03:12 +02:00 committed by Greg Kroah-Hartman
parent b94b3a627f
commit e697949944
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/usbip/userspace/src/usbip_network.c
View file

@ -248,10 +248,10 @@ int usbip_net_tcp_connect(char *hostname, char *service)
close(sockfd);
}
freeaddrinfo(res);
if (!rp)
return EAI_SYSTEM;
freeaddrinfo(res);
return sockfd;
}

7
drivers/staging/usbip/userspace/src/usbipd.c
View file

@ -448,6 +448,7 @@ static int do_standalone_mode(int daemonize)
if (daemonize) {
if (daemon(0, 0) < 0) {
err("daemonizing failed: %s", strerror(errno));
usbip_host_driver_close();
return -1;
}
umask(0);
@ -456,14 +457,18 @@ static int do_standalone_mode(int daemonize)
set_signal();
ai_head = do_getaddrinfo(NULL, PF_UNSPEC);
if (!ai_head)
if (!ai_head) {
usbip_host_driver_close();
return -1;
}
info("starting " PROGNAME " (%s)", usbip_version_string);
nsockfd = listen_all_addrinfo(ai_head, sockfdlist);
if (nsockfd <= 0) {
err("failed to open a listening socket");
freeaddrinfo(ai_head);
usbip_host_driver_close();
return -1;
}
fds = calloc(nsockfd, sizeof(struct pollfd));