aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-22 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

gossip: Add CRC32 checksum to the gossip_store

Browse Source 
Signed-off-by: Christian Decker <decker.christian@gmail.com>
Reported-by: Rusty Russell @rustyrussell
This commit is contained in:
Christian Decker
2018-05-26 12:44:27 +02:00
committed by Rusty Russell
parent 9acb92103c
commit 402125a70e
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gossipd/gossip_store.c
View File

@@ -1,5 +1,6 @@
#include "gossip_store.h" #include "gossip_store.h"
#include <ccan/crc/crc.h>
#include <ccan/endian/endian.h> #include <ccan/endian/endian.h>
#include <ccan/read_write_all/read_write_all.h> #include <ccan/read_write_all/read_write_all.h>
#include <common/status.h> #include <common/status.h>
@@ -12,7 +13,7 @@
#include <wire/wire.h> #include <wire/wire.h>
#define GOSSIP_STORE_FILENAME "gossip_store" #define GOSSIP_STORE_FILENAME "gossip_store"
static u8 gossip_store_version = 0x01; static u8 gossip_store_version = 0x02;
struct gossip_store { struct gossip_store {
int fd; int fd;
@@ -63,14 +64,17 @@ struct gossip_store *gossip_store_new(const tal_t *ctx)
static void gossip_store_append(struct gossip_store *gs, const u8 *msg) static void gossip_store_append(struct gossip_store *gs, const u8 *msg)
{ {
u32 msglen = tal_len(msg); u32 msglen = tal_len(msg);
beint32_t belen = cpu_to_be32(msglen); beint32_t checksum, belen = cpu_to_be32(msglen);
/* Only give error message once. */ /* Only give error message once. */
if (gs->fd == -1) if (gs->fd == -1)
return; return;
checksum = cpu_to_be32(crc32c(0, msg, msglen));
/* FORTIFY_SOURCE gets upset if we don't check return. */ /* FORTIFY_SOURCE gets upset if we don't check return. */
if (write(gs->fd, &belen, sizeof(belen)) != sizeof(belen) || if (write(gs->fd, &belen, sizeof(belen)) != sizeof(belen) ||
write(gs->fd, &checksum, sizeof(checksum)) != sizeof(checksum) ||
write(gs->fd, msg, msglen) != msglen) { write(gs->fd, msg, msglen) != msglen) {
status_broken("Failed writing to gossip store: %s", status_broken("Failed writing to gossip store: %s",
strerror(errno)); strerror(errno));
@@ -120,8 +124,8 @@ void gossip_store_local_add_channel(struct gossip_store *gs,
void gossip_store_load(struct routing_state *rstate, struct gossip_store *gs) void gossip_store_load(struct routing_state *rstate, struct gossip_store *gs)
{ {
beint32_t belen; beint32_t belen, becsum;
u32 msglen; u32 msglen, checksum;
u8 *msg, *gossip_msg; u8 *msg, *gossip_msg;
u64 satoshis; u64 satoshis;
struct short_channel_id scid; struct short_channel_id scid;
@@ -134,8 +138,10 @@ void gossip_store_load(struct routing_state *rstate, struct gossip_store *gs)
status_unusual("gossip_store: lseek failure"); status_unusual("gossip_store: lseek failure");
goto truncate_nomsg; goto truncate_nomsg;
} }
while (read(gs->fd, &belen, sizeof(belen)) == sizeof(belen)) { while (read(gs->fd, &belen, sizeof(belen)) == sizeof(belen) &&
read(gs->fd, &becsum, sizeof(becsum)) == sizeof(becsum)) {
msglen = be32_to_cpu(belen); msglen = be32_to_cpu(belen);
checksum = be32_to_cpu(becsum);
msg = tal_arr(gs, u8, msglen); msg = tal_arr(gs, u8, msglen);
if (read(gs->fd, msg, msglen) != msglen) { if (read(gs->fd, msg, msglen) != msglen) {
@@ -143,6 +149,11 @@ void gossip_store_load(struct routing_state *rstate, struct gossip_store *gs)
goto truncate_nomsg; goto truncate_nomsg;
} }
if (checksum != crc32c(0, msg, msglen)) {
bad = "Checksum verification failed";
goto truncate;
}
if (fromwire_gossip_store_channel_announcement(msg, msg, if (fromwire_gossip_store_channel_announcement(msg, msg,
&gossip_msg, &gossip_msg,
&satoshis)) { &satoshis)) {