mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not chdir(/) in qemu-nbd before opening all files

Browse Source 
When qemu-nbd becomes a daemon it calls daemon(3) with
nochdir=0, so daemon(3) changes current directory to /.
But at this time, qemu-nbd did not open any user-specified
files yet, so by changing current directory, all non-absolute
paths becomes wrong.  The solution is to pass nochdir=1 to
daemon(3) function, and to chdir("/") after all init has
been performed, before entering the main loop, -- just like
a good daemon should do.

This patch is applicable for -stable.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Michael Tokarev 2012-01-16 18:37:44 +04:00 committed by Paolo Bonzini
parent 9de36b1a7c
commit 9faf31b68f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qemu-nbd.c
View File

@ -429,7 +429,7 @@ int main(int argc, char **argv)
pid = fork(); pid = fork();
if (pid == 0) { if (pid == 0) {
close(stderr_fd[0]); close(stderr_fd[0]);
ret = qemu_daemon(0, 0); ret = qemu_daemon(1, 0);
/* Temporarily redirect stderr to the parent's pipe... */ /* Temporarily redirect stderr to the parent's pipe... */
dup2(stderr_fd[1], STDERR_FILENO); dup2(stderr_fd[1], STDERR_FILENO);
@ -527,6 +527,12 @@ int main(int argc, char **argv)
qemu_set_fd_handler2(fd, nbd_can_accept, nbd_accept, NULL, qemu_set_fd_handler2(fd, nbd_can_accept, nbd_accept, NULL,
(void *)(uintptr_t)fd); (void *)(uintptr_t)fd);
/* now when the initialization is (almost) complete, chdir("/")
* to free any busy filesystems */
if (chdir("/") < 0) {
err(EXIT_FAILURE, "Could not chdir to root directory");
}
do { do {
main_loop_wait(false); main_loop_wait(false);
} while (!sigterm_reported && (persistent || !nbd_started || nb_fds > 0)); } while (!sigterm_reported && (persistent || !nbd_started || nb_fds > 0));