Skip to content

Commit 4fc5c74

Browse files
frozencemeterydhowells
authored andcommitted
verify_pefile: relax wrapper length check
The PE Format Specification (section "The Attribute Certificate Table (Image Only)") states that `dwLength` is to be rounded up to 8-byte alignment when used for traversal. Therefore, the field is not required to be an 8-byte multiple in the first place. Accordingly, pesign has not performed this alignment since version 0.110. This causes kexec failure on pesign'd binaries with "PEFILE: Signature wrapper len wrong". Update the comment and relax the check. Signed-off-by: Robbie Harwood <[email protected]> Signed-off-by: David Howells <[email protected]> cc: Jarkko Sakkinen <[email protected]> cc: Eric Biederman <[email protected]> cc: Herbert Xu <[email protected]> cc: [email protected] cc: [email protected] cc: [email protected] Link: https://learn.microsoft.com/en-us/windows/win32/debug/pe-format#the-attribute-certificate-table-image-only Link: https://github.com/rhboot/pesign Link: https://lore.kernel.org/r/[email protected]/ # v2
1 parent 47f9e4c commit 4fc5c74

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

crypto/asymmetric_keys/verify_pefile.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,15 @@ static int pefile_strip_sig_wrapper(const void *pebuf,
135135
pr_debug("sig wrapper = { %x, %x, %x }\n",
136136
wrapper.length, wrapper.revision, wrapper.cert_type);
137137

138-
/* Both pesign and sbsign round up the length of certificate table
139-
* (in optional header data directories) to 8 byte alignment.
138+
/* sbsign rounds up the length of certificate table (in optional
139+
* header data directories) to 8 byte alignment. However, the PE
140+
* specification states that while entries are 8-byte aligned, this is
141+
* not included in their length, and as a result, pesign has not
142+
* rounded up since 0.110.
140143
*/
141-
if (round_up(wrapper.length, 8) != ctx->sig_len) {
142-
pr_debug("Signature wrapper len wrong\n");
144+
if (wrapper.length > ctx->sig_len) {
145+
pr_debug("Signature wrapper bigger than sig len (%x > %x)\n",
146+
ctx->sig_len, wrapper.length);
143147
return -ELIBBAD;
144148
}
145149
if (wrapper.revision != WIN_CERT_REVISION_2_0) {

0 commit comments

Comments
 (0)