From: Neil Stainton <nstainton@asl-control.co.uk>
Date: Wed, 12 Sep 2018 11:02:51 +0000 (+0000)
Subject: cmd: env: Fix CRC calculation for 'env export -c -s'
X-Git-Tag: v2018.11-rc1~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d71b029d1d178fb2e1cdb63ae5f45d10f90acca6;p=platform%2Fkernel%2Fu-boot.git

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>
---

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 @@ NXTARG:		;
 	}
 
 	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