vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

grub-module-verifier: Report the filename or modname in errors

Browse source 
Make it so that when grub-module-verifier complains of an issue, it tells you
which module the issue was with.

Signed-off-by: Peter Jones <pjones@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Peter Jones 2018-08-01 12:23:03 -04:00 • committed by Vincent Batts
parent 380ce92d70
commit 65fdb2de04
3 changed files with 36 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/grub-module-verifier.c
View file

@ -157,7 +157,7 @@ main (int argc, char **argv)
if (strcmp(archs[arch].name, argv[2]) == 0)
break;
if (arch == ARRAY_SIZE(archs))
grub_util_error("unknown arch: %s", argv[2]);
grub_util_error("%s: unknown arch: %s", argv[1], argv[2]);
for (whitelist = 0; whitelist < ARRAY_SIZE(whitelists); whitelist++)
if (strcmp(whitelists[whitelist].arch, argv[2]) == 0
@ -169,8 +169,8 @@ main (int argc, char **argv)
module_size = grub_util_get_image_size (argv[1]);
module_img = grub_util_read_image (argv[1]);
if (archs[arch].voidp_sizeof == 8)
grub_module_verify64(module_img, module_size, &archs[arch], whitelist_empty);
grub_module_verify64(argv[1], module_img, module_size, &archs[arch], whitelist_empty);
else
grub_module_verify32(module_img, module_size, &archs[arch], whitelist_empty);
grub_module_verify32(argv[1], module_img, module_size, &archs[arch], whitelist_empty);
return 0;
}