summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2019-06-08 02:52:21 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2019-06-08 02:52:21 +0000
commita8ad1cd74134d2b3520e8af228c7cb099247a2db (patch)
tree1b55a4779a1b60e319c862db710d2e3fc28d6688 /sys/arch/i386
parent270496b73b1bda4054c9f0d09c16710d5daf64d3 (diff)
When loading intel microcode in the non-efi case, error if the file is
larger than 256KB not 128KB to cope with the 06-8e-09 microcode which is currently 193KB. Reported and tested by Paul de Weerd. Matches a diff from claudio@
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/stand/boot/conf.c4
-rw-r--r--sys/arch/i386/stand/libsa/exec_i386.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c
index 97adc6d3591..0e6cccc3741 100644
--- a/sys/arch/i386/stand/boot/conf.c
+++ b/sys/arch/i386/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.68 2019/04/10 04:19:32 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.69 2019/06/08 02:52:20 jsg Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -41,7 +41,7 @@
#include <dev/cons.h>
#include "debug.h"
-const char version[] = "3.37";
+const char version[] = "3.38";
int debug = 1;
diff --git a/sys/arch/i386/stand/libsa/exec_i386.c b/sys/arch/i386/stand/libsa/exec_i386.c
index d2e6152cf42..97674e6d165 100644
--- a/sys/arch/i386/stand/libsa/exec_i386.c
+++ b/sys/arch/i386/stand/libsa/exec_i386.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_i386.c,v 1.49 2019/04/10 04:17:35 deraadt Exp $ */
+/* $OpenBSD: exec_i386.c,v 1.50 2019/06/08 02:52:20 jsg Exp $ */
/*
* Copyright (c) 1997-1998 Michael Shalayeff
@@ -224,7 +224,7 @@ ucode_load(void)
return;
buflen = sb.st_size;
- if (buflen > 128*1024) {
+ if (buflen > 256*1024) {
printf("ucode too large\n");
return;
}