efi: ensure 8 byte alignment of buffer, as ReadBlocks() method will fail otherwise

2 files changed, 5 insertions, 3 deletions

diff --git a/sys/src/boot/efi/iso.c b/sys/src/boot/efi/iso.c
index f994419cd..05b54ca4a 100644
--- a/sys/src/boot/efi/iso.c
+++ b/sys/src/boot/efi/iso.c
@@ -171,9 +171,10 @@ Foundpvd:
 static void*
 isoopen(char *path)
 {
-	static Extend ex[1];
+	static uchar buf[sizeof(Extend)+8];
+	Extend *ex = (Extend*)((uintptr)(buf+7)&~7);
 
-	if(isowalk(ex,  path))
+	if(isowalk(ex, path))
 		return nil;
 	return ex;
 }
diff --git a/sys/src/boot/efi/pxe.c b/sys/src/boot/efi/pxe.c
index 87d7a7e2b..5058a845f 100644
--- a/sys/src/boot/efi/pxe.c
+++ b/sys/src/boot/efi/pxe.c
@@ -306,7 +306,8 @@ tftpopen(Tftp *t, char *path)
 static void*
 pxeopen(char *name)
 {
-	static Tftp t[1];
+	static uchar buf[sizeof(Tftp)+8];
+	Tftp *t = (Tftp*)((uintptr)(buf+7)&~7);
 
 	memset(t, 0, sizeof(Tftp));