Skip to content

Commit f127b89

Browse files
committed
head.S: move skl_info and bootloader_data fields back
Fixes issue: ``` loader/slaunch/skl.c:117:slaunch: Possible SKL module measures bootloader data: 16424 (measured prefix) > 170 (data offset) error: SKL module isn't correct. ``` Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
1 parent 60df73b commit f127b89

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

head.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ GLOBAL(sl_header)
4848
.long 0xffffffff /* Reserved */
4949
.long _end_of_signed + 0x640 /* Total Length including signature and pubkey raw data */
5050
.word soc_flag /* Offset to SOCFLAG Structure, see below */
51-
.word skl_info /* Offset to SKL info with UUID and version */
52-
.word bootloader_data /* Offset to SLRT filled by the bootloader */
5351

5452
soc_flag:
5553
/*
@@ -66,6 +64,8 @@ soc_flag:
6664
.long 0x00a10f00
6765
.long 0x00a80f00
6866
.long 0x00aa0f00
67+
.word skl_info /* Offset to SKL info with UUID and version */
68+
.word bootloader_data /* Offset to SLRT filled by the bootloader */
6969
ENDDATA(sl_header)
7070

7171
.text

sanity_check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
. util.sh
33

4-
SKL_INFO=`hexdump "$SLB_FILE" -s30 -n2 -e '/2 "%u"'`
4+
SKL_INFO=`hexdump "$SLB_FILE" -s66 -n2 -e '/2 "%u"'`
55

66
if ! od --format=x8 --skip-bytes=$SKL_INFO --read-bytes=16 $SLB_FILE | grep -q "e91192048e26f178 02ccc4765bc82a83"; then
77
echo "ERROR: SKL UUID missing or misplaced in $SLB_FILE" >&2

0 commit comments

Comments
 (0)