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

common/msg_queue: make sure to close any pending fds on destruction.

Browse Source 
We only hand fds to connectd for now, so this doesn't happen (we don't
destroy that queue except on shutdown).  But it's still a potential issue.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2024-07-09 11:22:31 +09:30
parent 5a5fee92b3
commit 6f8754a72b
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
common/msg_queue.c
View File

@ -1,5 +1,6 @@
#include "config.h"
#include <assert.h>
#include <ccan/cast/cast.h>
#include <common/msg_queue.h>
#include <common/utils.h>
#include <wire/wire.h>
@ -9,11 +10,35 @@ struct msg_queue {
const u8 **q;
};
static int extract_fd(const u8 *msg)
{
const u8 *p = msg + sizeof(u16);
size_t len = tal_count(msg) - sizeof(u16);
if (fromwire_peektype(msg) != MSG_PASS_FD)
return -1;
return fromwire_u32(&p, &len);
}
/* Close any fds left in queue! */
static void destroy_msg_queue(struct msg_queue *q)
{
for (size_t i = 0; i < tal_count(q->q); i++) {
int fd = extract_fd(q->q[i]);
if (fd != -1)
close(fd);
}
}
struct msg_queue *msg_queue_new(const tal_t *ctx, bool fd_passing)
{
struct msg_queue *q = tal(ctx, struct msg_queue);
q->fd_passing = fd_passing;
q->q = tal_arr(q, const u8 *, 0);
if (q->fd_passing)
tal_add_destructor(q, destroy_msg_queue);
return q;
}
@ -62,14 +87,9 @@ const u8 *msg_dequeue(struct msg_queue *q)
int msg_extract_fd(const struct msg_queue *q, const u8 *msg)
{
const u8 *p = msg + sizeof(u16);
size_t len = tal_count(msg) - sizeof(u16);
assert(q->fd_passing);
if (fromwire_peektype(msg) != MSG_PASS_FD)
return -1;
return fromwire_u32(&p, &len);
return extract_fd(msg);
}
void msg_wake(const struct msg_queue *q)