andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools/fiptool: Fix UUID parsing in blob handling 

Commit 033648652f ("Make TF UUID RFC 4122 compliant") changed the scanf
parsing string to handle endianness correctly.
However that changed the number of items sscanf handles, without
adjusting the sanity check just below.

Increase the expected return value from 11 to 16 to let fiptool handle
UUIDs given as blob parameters correctly again.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
This commit is contained in:
Andre Przywara 2019-01-29 09:25:14 +00:00
parent e9b77791ab
commit e56b8dc82b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/fiptool/fiptool.c
View File

@ -271,10 +271,10 @@ static void uuid_from_str(uuid_t *u, const char *s)
&u->node[2], &u->node[3],
&u->node[4], &u->node[5]);
/*
* Given the format specifier above, we expect 11 items to be scanned
* Given the format specifier above, we expect 16 items to be scanned
* for a properly formatted UUID.
*/
if (n != 11)
if (n != 16)
log_errx("Invalid UUID: %s", s);
}