aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-08 08:34:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

msg_queue: don't allow magic MSG_PASS_FD message for peers.

Browse Source 
msg_queue was originally designed for inter-daemon comms, and so it has
a special mechanism to mark that we're trying to send an fd.  Unfortunately,
a peer could also send such a message, confusing us!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-01-11 11:46:18 +10:30
parent a93c49ca65
commit d51fb5207a
6 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/msg_queue.h
View File

@@ -8,8 +8,9 @@
/* Reserved type used to indicate we're actually passing an fd. */
#define MSG_PASS_FD 0xFFFF
/* Allocate a new msg queue. */
struct msg_queue *msg_queue_new(const tal_t *ctx);
/* Allocate a new msg queue; if we control all msgs we send/receive,
* we can pass fds. Otherwise, set @fd_passing to false. */
struct msg_queue *msg_queue_new(const tal_t *ctx, bool fd_passing);
/* If add is taken(), freed after sending. msg_wake() implied. */
void msg_enqueue(struct msg_queue *q, const u8 *add TAKES);
@@ -27,7 +28,7 @@ void msg_wake(const struct msg_queue *q);
const u8 *msg_dequeue(struct msg_queue *q);
/* Returns -1 if not an fd: close after sending. */
int msg_extract_fd(const u8 *msg);
int msg_extract_fd(const struct msg_queue *q, const u8 *msg);
#define msg_queue_wait(conn, q, next, arg) \
io_out_wait((conn), (q), (next), (arg))