]> xenbits.xensource.com Git - people/sstabellini/xen-unstable.git/.git/commitdiff
vchan-socket-proxy: Cleanup resources on exit
authorJason Andryuk <jandryuk@gmail.com>
Thu, 11 Jun 2020 03:29:35 +0000 (23:29 -0400)
committerWei Liu <wl@xen.org>
Fri, 26 Jun 2020 12:00:02 +0000 (12:00 +0000)
Close open FDs and close th vchan connection when exiting the program.

This addresses some Coverity findings about leaking file descriptors.

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
Acked-by: Wei Liu <wl@xen.org>
Reviewed-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Release-acked-by: Paul Durrant <paul@xen.org>
tools/libvchan/vchan-socket-proxy.c

index cd7629bc4e20fb2f94b9a9b0b065086d4cbc0caa..3552783ec25f445dc2fd2af4846744705fa714d9 100644 (file)
@@ -518,5 +518,14 @@ int main(int argc, char **argv)
         }
     }
 
+    if (state.output_fd >= 0)
+        close(state.output_fd);
+    if (state.input_fd >= 0)
+        close(state.input_fd);
+    if (state.ctrl)
+        libxenvchan_close(state.ctrl);
+    if (socket_fd >= 0)
+        close(socket_fd);
+
     return ret;
 }