Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tools: kwboot: Don't patch image header if signed

Browse source 
It is not possible to modify image with secure header due to
cryptographic signature.

Signed-off-by: Pali Rohár <pali@kernel.org>
[ refactored ]
Signed-off-by: Marek Behún <marek.behun@nic.cz>
This commit is contained in:
Pali Rohár 2021-09-24 23:06:57 +02:00 committed by Stefan Roese
parent 732c930b21
commit 550c93085a
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tools/kwboot.c
View file

@ -756,6 +756,18 @@ kwboot_img_csum8(void *_data, size_t size)
return csum; return csum;
} }
static int
kwboot_img_is_secure(void *img)
{
struct opt_hdr_v1 *ohdr;
for_each_opt_hdr_v1 (ohdr, img)
if (ohdr->headertype == OPT_HDR_V1_SECURE_TYPE)
return 1;
return 0;
}
static int static int
kwboot_img_patch_hdr(void *img, size_t size) kwboot_img_patch_hdr(void *img, size_t size)
{ {
@ -764,6 +776,7 @@ kwboot_img_patch_hdr(void *img, size_t size)
uint8_t csum; uint8_t csum;
size_t hdrsz = sizeof(*hdr); size_t hdrsz = sizeof(*hdr);
int image_ver; int image_ver;
int is_secure;
rc = -1; rc = -1;
hdr = img; hdr = img;
@ -796,12 +809,19 @@ kwboot_img_patch_hdr(void *img, size_t size)
goto out; goto out;
} }
if (hdr->blockid == IBR_HDR_UART_ID) { is_secure = kwboot_img_is_secure(img);
rc = 0;
goto out;
}
hdr->blockid = IBR_HDR_UART_ID; if (hdr->blockid != IBR_HDR_UART_ID) {
if (is_secure) {
fprintf(stderr,
"Image has secure header with signature for non-UART booting\n");
errno = EINVAL;
goto out;
}
kwboot_printv("Patching image boot signature to UART\n");
hdr->blockid = IBR_HDR_UART_ID;
}
if (image_ver == 0) { if (image_ver == 0) {
struct main_hdr_v0 *hdr_v0 = img; struct main_hdr_v0 *hdr_v0 = img;