Date: Wed, 19 Dec 2018 22:47:38 +0000 (UTC) From: Marcin Wojtas <mw@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r342253 - head/usr.sbin/uefisign Message-ID: <201812192247.wBJMlcWt049729@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mw Date: Wed Dec 19 22:47:37 2018 New Revision: 342253 URL: https://svnweb.freebsd.org/changeset/base/342253 Log: Fix alignment issue in uefisign The pe_certificate structure has to be aligned to 8 bytes. [1] Since this is now checked in edk2, any binaries signed with older version of this tool will fail verification. References: [1] https://docs.microsoft.com/en-us/windows/desktop/Debug/pe-format#the-attribute-certificate-table-image-only Submitted by: Kornel Duleba <mindal@semihalf.com> Reviewed by: trasz Obtained from: Semihalf Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D18554 Modified: head/usr.sbin/uefisign/pe.c Modified: head/usr.sbin/uefisign/pe.c ============================================================================== --- head/usr.sbin/uefisign/pe.c Wed Dec 19 22:46:03 2018 (r342252) +++ head/usr.sbin/uefisign/pe.c Wed Dec 19 22:47:37 2018 (r342253) @@ -56,6 +56,8 @@ __FBSDID("$FreeBSD$"); #define __CTASSERT(x, y) typedef char __assert_ ## y [(x) ? 1 : -1] #endif +#define PE_ALIGMENT_SIZE 8 + struct mz_header { uint8_t mz_signature[2]; uint8_t mz_dont_care[58]; @@ -498,19 +500,17 @@ parse(struct executable *x) } static off_t -append(struct executable *x, void *ptr, size_t len) +append(struct executable *x, void *ptr, size_t len, size_t aligment) { off_t off; - /* - * XXX: Alignment. - */ off = x->x_len; - x->x_buf = realloc(x->x_buf, x->x_len + len); + x->x_buf = realloc(x->x_buf, x->x_len + len + aligment); if (x->x_buf == NULL) err(1, "realloc"); memcpy(x->x_buf + x->x_len, ptr, len); - x->x_len += len; + memset(x->x_buf + x->x_len + len, 0, aligment); + x->x_len += len + aligment; return (off); } @@ -522,6 +522,7 @@ update(struct executable *x) struct pe_certificate *pc; struct pe_directory_entry pde; size_t pc_len; + size_t pc_aligment; off_t pc_off; pc_len = sizeof(*pc) + x->x_signature_len; @@ -529,6 +530,11 @@ update(struct executable *x) if (pc == NULL) err(1, "calloc"); + if (pc_len % PE_ALIGMENT_SIZE > 0) + pc_aligment = PE_ALIGMENT_SIZE - (pc_len % PE_ALIGMENT_SIZE); + else + pc_aligment = 0; + #if 0 /* * Note that pc_len is the length of pc_certificate, @@ -545,7 +551,7 @@ update(struct executable *x) pc->pc_type = PE_CERTIFICATE_TYPE; memcpy(&pc->pc_signature, x->x_signature, x->x_signature_len); - pc_off = append(x, pc, pc_len); + pc_off = append(x, pc, pc_len, pc_aligment); #if 0 printf("added signature chunk at offset %zd, len %zd\n", pc_off, pc_len); @@ -554,7 +560,7 @@ update(struct executable *x) free(pc); pde.pde_rva = pc_off; - pde.pde_size = pc_len; + pde.pde_size = pc_len + pc_aligment; memcpy(x->x_buf + x->x_certificate_entry_off, &pde, sizeof(pde)); checksum = compute_checksum(x);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812192247.wBJMlcWt049729>