diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-04-24 14:26:47 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-04-24 14:26:50 +0200 |
commit | e6cc84d8b751c76571c26e935261fd6f8cac67b7 (patch) | |
tree | e7a9e47f794b405837017805fed10dc042103671 | |
parent | ec01cbce2165deb3d814f0c031043fa999632eaa (diff) | |
download | barebox-e6cc84d8b751c76571c26e935261fd6f8cac67b7.tar.gz barebox-e6cc84d8b751c76571c26e935261fd6f8cac67b7.tar.xz |
state: backend_raw: init digest earlier
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>
-rw-r--r-- | common/state/backend_format_raw.c | 10 |
1 files 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) { |