From 383dcc4ea95d46ca17d7efd982c8596c7097b56d Mon Sep 17 00:00:00 2001
From: sys64738 <sys64738@hellsite.site>
Date: Thu, 26 Aug 2021 20:29:01 +0200
Subject: [PATCH] clear remaining 32 reserved bytes

---
 host/dpctl/protocol.py | 2 +-
 src/storage_internal.h | 7 ++++++-
 src/storage_save.c     | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/host/dpctl/protocol.py b/host/dpctl/protocol.py
index 6d24d4e..f5567a4 100644
--- a/host/dpctl/protocol.py
+++ b/host/dpctl/protocol.py
@@ -53,7 +53,7 @@ class StorageInfo(NamedTuple):
 
         mag = b[:16]
         ver, cm, nm = struct.unpack('<HBB', b[16:20])
-        res = b[20:28]
+        res = b[20:28] + b[245-32:]
         d2tab = struct.unpack('<I', b[28:32])
 
         mdat = StorageInfoMode.list_from_bytes(b[32:256-32])
diff --git a/src/storage_internal.h b/src/storage_internal.h
index 5c32348..cda53e9 100644
--- a/src/storage_internal.h
+++ b/src/storage_internal.h
@@ -48,13 +48,18 @@ __attribute__((__packed__)) struct mode_data {
 #define MAX_MDT_ELEMENTS ((256 - 64) / sizeof(struct mode_data)) /* should be 16 */
 
 __attribute__((__packed__)) struct storage_header {
+    // +0
     uint8_t magic[STORAGE_MAGIC_LEN];
+    // +16
     uint16_t fwversion;
     uint8_t curmode;
     uint8_t nmodes; // *stored* modes, not modes it knows of
     uint8_t reserved[8];
     uint32_t table_djb2;
-    struct mode_data mode_data_table[MAX_MDT_ELEMENTS];
+    // +32
+    struct mode_data mode_data_table[MAX_MDT_ELEMENTS]; // 192 bytes in size
+    // +224
+    uint8_t reserved2[32];
 };
 
 // TODO: static assert sizeof(struct storage_header) == 256
diff --git a/src/storage_save.c b/src/storage_save.c
index 3f6ee70..a80ca4d 100644
--- a/src/storage_save.c
+++ b/src/storage_save.c
@@ -28,6 +28,7 @@ static size_t storage_allocate_new(void) {
 
     memcpy(header_tmp.magic, STORAGE_MAGIC, STORAGE_MAGIC_LEN);
     memset(header_tmp.reserved, 0xff, sizeof(header_tmp.reserved));
+    memset(header_tmp.reserved2, 0xff, sizeof(header_tmp.reserved2));
     memset(header_tmp.mode_data_table, 0xff, sizeof(header_tmp.mode_data_table));
 
     header_tmp.fwversion = STORAGE_VER;