From: Christian Lindig Date: Wed, 27 Feb 2019 10:33:42 +0000 (+0000) Subject: tools/ocaml: Dup2 /dev/null to stdin in daemonize() X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=677e64dbe315343620c3b266e9eb16623b118038;p=people%2Fliuw%2Fxen.git tools/ocaml: Dup2 /dev/null to stdin in daemonize() Don't close stdin in daemonize() but dup2 /dev/null instead. Otherwise, fd 0 gets reused later: [root@idol ~]# ls -lav /proc/`pgrep xenstored`/fd total 0 dr-x------ 2 root root 0 Feb 28 11:02 . dr-xr-xr-x 9 root root 0 Feb 27 15:59 .. lrwx------ 1 root root 64 Feb 28 11:02 0 -> /dev/xen/evtchn l-wx------ 1 root root 64 Feb 28 11:02 1 -> /dev/null l-wx------ 1 root root 64 Feb 28 11:02 2 -> /dev/null lrwx------ 1 root root 64 Feb 28 11:02 3 -> /dev/xen/privcmd ... Signed-off-by: Christian Lindig Reviewed-by: Andrew Cooper Acked-by: Wei Liu Release-acked-by: Juergen Gross --- diff --git a/tools/ocaml/xenstored/stdext.ml b/tools/ocaml/xenstored/stdext.ml index 879565c515..4f2f3a2c8c 100644 --- a/tools/ocaml/xenstored/stdext.ml +++ b/tools/ocaml/xenstored/stdext.ml @@ -100,9 +100,9 @@ let daemonize () = begin match Unix.fork () with | 0 -> - let nullfd = Unix.openfile "/dev/null" [ Unix.O_WRONLY ] 0 in + let nullfd = Unix.openfile "/dev/null" [ Unix.O_RDWR ] 0 in begin try - Unix.close Unix.stdin; + Unix.dup2 nullfd Unix.stdin; Unix.dup2 nullfd Unix.stdout; Unix.dup2 nullfd Unix.stderr; with exn -> Unix.close nullfd; raise exn