summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2017-07-06 20:01:12 +0200
committerLucas Stach <l.stach@pengutronix.de>2017-07-14 16:46:14 +0200
commitab909481ee5e9d46325abcdeefee1bd5a705a1da (patch)
tree81279327080a6e305cd4af3254ad04af8feffe66
parentea1bb5616b362adceec5df87dfb39d5973062afc (diff)
downloadbarebox-ab909481ee5e9d46325abcdeefee1bd5a705a1da.tar.gz
barebox-ab909481ee5e9d46325abcdeefee1bd5a705a1da.tar.xz
crypto: digest: Fix digesting over memory chunks > 4096 bytes
There are two different cases that are handled in digest_file_window: a) the file to digest is memmappable (e.g. /dev/mem) b) it isn't (e.g. files in /) In both cases a file is digested in hunks of (up to) 4096 bytes. After each hunk in b) the buffer that is fed to digest_update() is then overwritten using read() to get the next hunk to digest. In case a) however it was forgotten to step forward in the buffer and instead the same data was handed to digest_update() again and again. So to fix that increase buffer by the number of bytes already digested for case a) which is characterized by flags == 0. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
-rw-r--r--crypto/digest.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/digest.c b/crypto/digest.c
index 7a8c3c092d..bc6de0b98f 100644
--- a/crypto/digest.c
+++ b/crypto/digest.c
@@ -272,6 +272,9 @@ int digest_file_window(struct digest *d, const char *filename,
goto out_free;
size -= now;
len += now;
+
+ if (!flags)
+ buf += now;
}
if (sig)