Make SBAT variable payload introspectable #483
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chrisccoulson
force-pushed
the
add-sbatlevel-section
branch
3 times, most recently
from
dd2877f to
4da89d0
Compare
|
👍 |
frozencemetery
requested changes
Jun 8, 2022
sbat_var.S
Outdated
|
|
||
| # include "include/sbat_var_defs.h" | ||
|
|
||
| #if defined(ENABLE_SHIM_DEVEL) |
There was a problem hiding this comment.
Wouldn't it be better to have this stuff in sbat_ver_defs.h?
There was a problem hiding this comment.
Yeah, I've put it there instead.
sbat_var.S
Outdated
| @@ -0,0 +1,46 @@ | |||
| // SPDX-License-Identifier: BSD-2-Clause-Patent | |||
|
|
|||
| # include "include/sbat_var_defs.h" | |||
There was a problem hiding this comment.
Extra whitespace between the '#' and "include".
sbat_var.S
Outdated
| SBAT_VAR_LATEST_REVOCATIONS | ||
| #endif /* ENABLE_SHIM_DEVEL */ | ||
|
|
||
| .section .sbatlevel, "a", %progbits |
There was a problem hiding this comment.
Indentation from here down seems wonky. So far for asm files (i.e., cert.S) we've used hard tabs only. Some of these lines are using tabs, some spaces.
There was a problem hiding this comment.
I've fixed this to just use tabs now.
|
(Also, this needs rebased at some point - conflicts in sbat.h.) |
Given a set of EFI variables and boot assets, it should be possible to compute what the value of PCR 7 will be on the next boot. As shim manages the contents of the SbatLevel variable and this is measured to PCR 7, export the payloads that shim contains in a new COFF section (.sbatlevel) so that it can be introspected by code outside of shim. The new section works a bit like .vendor_cert - it contains a header and then the payload. In this case, the header contains no size fields because the strings are NULL terminated. Shim uses this new section internally in set_sbat_uefi_variable. The .sbatlevel section starts with a 4 byte version field which is not used by shim but may be useful for external auditors if the format of the section contents change in the future. Signed-off-by: Chris Coulson <[email protected]>
chrisccoulson
force-pushed
the
add-sbatlevel-section
branch
from
4da89d0 to
6ff23a6
Compare
frozencemetery
approved these changes
Jun 8, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is for after 15.6, but we'll probably add something like this to
our next shim in Ubuntu, so I'd at least like to agree on the correct
way to do this.
Given a set of EFI variables and boot assets, it should be possible
to compute what the value of PCR 7 will be on the next boot.
As shim manages the contents of the SbatLevel variable and this is
measured to PCR 7, export the payloads that shim contains in a new
COFF section (.sbatlevel) so that it can be introspected by code
outside of shim.
The new section works a bit like .vendor_cert - it contains a header
and then the payload. In this case, the header contains no size fields
because the strings are NULL terminated. Shim uses this new section
internally in set_sbat_uefi_variable.
The .sbatlevel section starts with a 4 byte version field which is
not used by shim but may be useful for external auditors if the
format of the section contents change in the future.