staging: usbip: userspace: avoid memory leaks

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>

diff --git a/drivers/staging/usbip/userspace/src/usbip_network.c b/drivers/staging/usbip/userspace/src/usbip_network.c
index 4cb76e5d71c8e915997e7a8b9483f722da3b155a..b12448ec69ab48c04e45c87a43a0b5a2f2fab746 100644 (file)
--- a/drivers/staging/usbip/userspace/src/usbip_network.c
+++ b/drivers/staging/usbip/userspace/src/usbip_network.c
@@ -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;
 }

diff --git a/drivers/staging/usbip/userspace/src/usbipd.c b/drivers/staging/usbip/userspace/src/usbipd.c
index cc3be17b9e240dce8b50bd2e2615d210f5226d73..3f10c5183ffc467e50f12106887cbf5c56143231 100644 (file)
--- a/drivers/staging/usbip/userspace/src/usbipd.c
+++ b/drivers/staging/usbip/userspace/src/usbipd.c
@@ -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));