Skip to content

Commit

Permalink
hash.c: Correct non-hash subcommand crc32 addr-save support
Browse files Browse the repository at this point in the history
In the case of not having CONFIG_CMD_HASH but having CONFIG_CMD_CRC32
enabled (and not CONFIG_CRC32_VERIFY), we end up in this part of the
code path on hash_command().  However, we will only have exactly 3 args
here, and 3 > 3 is false, and we will not try and store the hash at the
address given as arg #3.  The next problem however is that we've been
moving argv around so the third value is now in argv[0] not argv[3].

Confirmed on AM335x Beaglebone White.

Signed-off-by: Tom Rini <[email protected]>
  • Loading branch information
trini committed Nov 25, 2013
1 parent c2e5e80 commit 4b756b0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions common/hash.c
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,8 @@ int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag,
printf("CRC32 for %08lx ... %08lx ==> %08lx\n",
addr, addr + len - 1, crc);

if (argc > 3) {
ptr = (ulong *)simple_strtoul(argv[3], NULL, 16);
if (argc >= 3) {
ptr = (ulong *)simple_strtoul(argv[0], NULL, 16);
*ptr = crc;
}
}
Expand Down

0 comments on commit 4b756b0

Please sign in to comment.