aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure fsync, connect and close are never accidentally passed negative arguments

Browse Source
This commit is contained in:
practicalswift
2018-01-08 21:09:01 +01:00
committed by Christian Decker
parent 795e42d757
commit 4bdd2452f2
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hsmd/hsm.c
View File

@@ -489,6 +489,10 @@ static void create_new_hsm(struct daemon_conn *master)
"closing: %s", strerror(errno)); "closing: %s", strerror(errno));
} }
fd = open(".", O_RDONLY); fd = open(".", O_RDONLY);
if (fd < 0) {
status_failed(STATUS_FAIL_INTERNAL_ERROR,
"opening: %s", strerror(errno));
}
if (fsync(fd) != 0) { if (fsync(fd) != 0) {
unlink_noerr("hsm_secret"); unlink_noerr("hsm_secret");
status_failed(STATUS_FAIL_INTERNAL_ERROR, status_failed(STATUS_FAIL_INTERNAL_ERROR,

3
lightningd/jsonrpc.c
View File

@@ -673,6 +673,9 @@ void setup_jsonrpc(struct lightningd *ld, const char *rpc_filename)
} }
fd = socket(AF_UNIX, SOCK_STREAM, 0); fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd < 0) {
errx(1, "domain socket creation failed");
}
if (strlen(rpc_filename) + 1 > sizeof(addr.sun_path)) if (strlen(rpc_filename) + 1 > sizeof(addr.sun_path))
errx(1, "rpc filename '%s' too long", rpc_filename); errx(1, "rpc filename '%s' too long", rpc_filename);
strcpy(addr.sun_path, rpc_filename); strcpy(addr.sun_path, rpc_filename);

2
lightningd/subd.c
View File

@@ -121,7 +121,7 @@ static void close_taken_fds(va_list *ap)
int *fd; int *fd;
while ((fd = va_arg(*ap, int *)) != NULL) { while ((fd = va_arg(*ap, int *)) != NULL) {
if (taken(fd)) { if (taken(fd) && *fd >= 0) {
close(*fd); close(*fd);
*fd = -1; *fd = -1;
} }