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

lightningd/cryptomsg: only free written messages if they're marked take().

Browse source 
This fixes a leak in gossip, too.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2017-03-07 11:38:20 +10:30
parent c64447a929
commit a845b07ada
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lightningd/cryptomsg.c
View file

@ -5,6 +5,7 @@
#include <ccan/endian/endian.h> #include <ccan/endian/endian.h>
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>
#include <ccan/short_types/short_types.h> #include <ccan/short_types/short_types.h>
#include <ccan/take/take.h>
#include <lightningd/cryptomsg.h> #include <lightningd/cryptomsg.h>
#include <sodium/crypto_aead_chacha20poly1305.h> #include <sodium/crypto_aead_chacha20poly1305.h>
#include <status.h> #include <status.h>
@ -313,6 +314,8 @@ struct io_plan *peer_write_message(struct io_conn *conn,
assert(!pcs->out); assert(!pcs->out);
pcs->out = cryptomsg_encrypt_msg(conn, &pcs->cs, msg); pcs->out = cryptomsg_encrypt_msg(conn, &pcs->cs, msg);
if (taken(msg))
tal_free(msg);
pcs->next_out = next; pcs->next_out = next;
/* BOLT #8: /* BOLT #8:

2
lightningd/cryptomsg.h
View file

@ -39,7 +39,7 @@ struct io_plan *peer_read_message(struct io_conn *conn,
struct peer *, struct peer *,
u8 *msg)); u8 *msg));
/* Sends and frees message */ /* Sends message: frees if taken(msg). */
struct io_plan *peer_write_message(struct io_conn *conn, struct io_plan *peer_write_message(struct io_conn *conn,
struct peer_crypto_state *cs, struct peer_crypto_state *cs,
const u8 *msg, const u8 *msg,

10
lightningd/gossip/gossip.c
View file

@ -7,6 +7,7 @@
#include <ccan/list/list.h> #include <ccan/list/list.h>
#include <ccan/noerr/noerr.h> #include <ccan/noerr/noerr.h>
#include <ccan/read_write_all/read_write_all.h> #include <ccan/read_write_all/read_write_all.h>
#include <ccan/take/take.h>
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <daemon/broadcast.h> #include <daemon/broadcast.h>
#include <daemon/routing.h> #include <daemon/routing.h>
@ -184,8 +185,11 @@ static struct io_plan *peer_dump_gossip(struct io_conn *conn, struct peer *peer)
/* Going to wake up in pkt_out since we mix time based and message based wakeups */ /* Going to wake up in pkt_out since we mix time based and message based wakeups */
return io_out_wait(conn, peer, pkt_out, peer); return io_out_wait(conn, peer, pkt_out, peer);
} else { } else {
return peer_write_message(conn, &peer->pcs, next->payload, struct io_plan *ret;
ret = peer_write_message(conn, &peer->pcs, next->payload,
peer_dump_gossip); peer_dump_gossip);
tal_free(next);
return ret;
} }
} }
@ -198,7 +202,7 @@ static struct io_plan *pkt_out(struct io_conn *conn, struct peer *peer)
out = peer->msg_out[0]; out = peer->msg_out[0];
memmove(peer->msg_out, peer->msg_out + 1, (sizeof(*peer->msg_out)*(n-1))); memmove(peer->msg_out, peer->msg_out + 1, (sizeof(*peer->msg_out)*(n-1)));
tal_resize(&peer->msg_out, n-1); tal_resize(&peer->msg_out, n-1);
return peer_write_message(conn, &peer->pcs, out, pkt_out); return peer_write_message(conn, &peer->pcs, take(out), pkt_out);
} }
if (peer->gossip_sync){ if (peer->gossip_sync){
@ -281,7 +285,7 @@ static struct io_plan *peer_send_init(struct io_conn *conn, struct peer *peer)
* supports. * supports.
*/ */
return peer_write_message(conn, &peer->pcs, return peer_write_message(conn, &peer->pcs,
towire_init(peer, NULL, NULL), take(towire_init(peer, NULL, NULL)),
peer_init_sent); peer_init_sent);
} }