[PATCH] state: backend_raw: init digest earlier

[PATCH] state: backend_raw: init digest earlier

[Sascha Hauer]

In backend_format_raw_pack() digest_length is used before it's
initialized in backend_raw_digest_init() which results in a too small
memory allocation for the raw backend. Fix this and prevent a memory
corruption.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/state/backend_format_raw.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/state/backend_format_raw.c b/common/state/backend_format_raw.c
index 232856a209..d76718cf82 100644
--- a/common/state/backend_format_raw.c
+++ b/common/state/backend_format_raw.c
@@ -211,6 +211,12 @@ static int backend_format_raw_pack(struct state_backend_format *format,
 	unsigned int size_data;
 	int ret;
 
+	if (backend_raw->algo) {
+		ret = backend_raw_digest_init(backend_raw);
+		if (ret)
+			return ret;
+	}
+
 	sv = list_last_entry(&state->variables, struct state_variable, list);
 	size_data = sv->start + sv->size;
 	size_full = size_data + sizeof(*header) + backend_raw->digest_length;
@@ -233,10 +239,6 @@ static int backend_format_raw_pack(struct state_backend_format *format,
 				   sizeof(*header) - sizeof(uint32_t));
 
 	if (backend_raw->algo) {
-		ret = backend_raw_digest_init(backend_raw);
-		if (ret)
-			return ret;
-
 		/* hmac over header and data */
 		ret = digest_update(backend_raw->digest, buf, sizeof(*header) + size_data);
 		if (ret) {
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox