mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

subd: don't leak fds if we fail to create subdaemon.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2017-10-11 20:29:50 +10:30 committed by Christian Decker
parent 4fa36c585d
commit 61786b9c90
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lightningd/subd.c
View File

@ -114,6 +114,18 @@ static struct subd_req *get_req(struct subd *sd, int reply_type)
return NULL; return NULL;
} }
static void close_taken_fds(va_list *ap)
{
int *fd;
while ((fd = va_arg(*ap, int *)) != NULL) {
if (taken(fd)) {
close(*fd);
*fd = -1;
}
}
}
/* We use sockets, not pipes, because fds are bidir. */ /* We use sockets, not pipes, because fds are bidir. */
static int subd(const char *dir, const char *name, const char *debug_subdaemon, static int subd(const char *dir, const char *name, const char *debug_subdaemon,
int *msgfd, int dev_disconnect_fd, va_list *ap) int *msgfd, int dev_disconnect_fd, va_list *ap)
@ -193,14 +205,8 @@ static int subd(const char *dir, const char *name, const char *debug_subdaemon,
close(childmsg[1]); close(childmsg[1]);
close(execfail[1]); close(execfail[1]);
if (ap) { if (ap)
while ((fd = va_arg(*ap, int *)) != NULL) { close_taken_fds(ap);
if (taken(fd)) {
close(*fd);
*fd = -1;
}
}
}
/* Child will close this without writing on successful exec. */ /* Child will close this without writing on successful exec. */
if (read(execfail[0], &err, sizeof(err)) == sizeof(err)) { if (read(execfail[0], &err, sizeof(err)) == sizeof(err)) {
@ -220,6 +226,8 @@ close_msgfd_fail:
close_noerr(childmsg[0]); close_noerr(childmsg[0]);
close_noerr(childmsg[1]); close_noerr(childmsg[1]);
fail: fail:
if (ap)
close_taken_fds(ap);
return -1; return -1;
} }