Skip to content

lightningd: fix double-free when forking subdaemon fails. #4330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 14, 2021
Merged

lightningd: fix double-free when forking subdaemon fails. #4330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lightningd/peer_control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,11 @@ peer_connected_hook_cb(struct peer_connected_hook_payload *payload STEALS,
struct peer *peer = payload->peer;
u8 *error;

/* Whatever happens, we free payload (it's currently a child
* of the peer, which may be freed if we fail to start
* subd). */
tal_steal(tmpctx, payload);

/* If we had a hook, interpret result. */
if (buffer) {
const jsmntok_t *resulttok;
Expand All @@ -977,7 +982,6 @@ peer_connected_hook_cb(struct peer_connected_hook_payload *payload STEALS,
buffer + m->start);
goto send_error;
}
tal_free(payload);
return;
} else if (!json_tok_streq(buffer, resulttok, "continue"))
fatal("Plugin returned an invalid response to the connected "
Expand Down Expand Up @@ -1031,7 +1035,6 @@ peer_connected_hook_cb(struct peer_connected_hook_payload *payload STEALS,
peer_restart_dualopend(peer, payload->pps,
channel, NULL);

tal_free(payload);
return;
#else
abort();
Expand All @@ -1044,7 +1047,6 @@ peer_connected_hook_cb(struct peer_connected_hook_payload *payload STEALS,
channel->peer->addr = addr;
peer_start_channeld(channel, payload->pps,
NULL, true);
tal_free(payload);
return;

case CLOSINGD_SIGEXCHANGE:
Expand All @@ -1053,7 +1055,6 @@ peer_connected_hook_cb(struct peer_connected_hook_payload *payload STEALS,
channel->peer->addr = addr;
peer_start_closingd(channel, payload->pps,
true, NULL);
tal_free(payload);
return;
}
abort();
Expand Down Expand Up @@ -1084,7 +1085,6 @@ peer_connected_hook_cb(struct peer_connected_hook_payload *payload STEALS,
} else
#endif /* EXPERIMENTAL_FEATURES */
peer_start_openingd(peer, payload->pps, error);
tal_free(payload);
}

REGISTER_SINGLE_PLUGIN_HOOK(peer_connected,
Expand Down