commit 960a5fd512689d0c34177d659017b64f28bd8167
author Neil Stainton <nstainton@asl-control.co.uk> Wed Sep 12 11:02:51 2018 +0000
committer Tom Rini <trini@konsulko.com> Sun Sep 30 13:00:23 2018 -0400
tree 6ca32599493f551396e808e376895241b3ac974a
parent 69733457decffe4b25b94e0746401d4e1ad26c54

cmd: env: Fix CRC calculation for 'env export -c -s'

Fix failure to reimport exported checksummed, size constrained data block.

'env export -c' command ignores optional -s size argument when calculating checksum causing subsequent 'env import -c' to fail.

Signed-off-by: Neil Stainton <nstainton@asl-control.co.uk>

cmd/nvedit.c

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 793b68b..de16c72 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -987,7 +987,8 @@
 	}
 
 	if (chk) {
-		envp->crc = crc32(0, envp->data, ENV_SIZE);
+		envp->crc = crc32(0, envp->data,
+				size ? size - offsetof(env_t, data) : ENV_SIZE);
 #ifdef CONFIG_ENV_ADDR_REDUND
 		envp->flags = ACTIVE_FLAG;
 #endif