diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-06-08 02:52:21 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-06-08 02:52:21 +0000 |
| commit | a8ad1cd74134d2b3520e8af228c7cb099247a2db (patch) | |
| tree | 1b55a4779a1b60e319c862db710d2e3fc28d6688 | |
| parent | 270496b73b1bda4054c9f0d09c16710d5daf64d3 (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@
| -rw-r--r-- | sys/arch/amd64/stand/boot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/libsa/exec_i386.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/boot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/exec_i386.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/amd64/stand/boot/conf.c b/sys/arch/amd64/stand/boot/conf.c index 7709bfeb608..3f043d2e75b 100644 --- a/sys/arch/amd64/stand/boot/conf.c +++ b/sys/arch/amd64/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.46 2019/05/15 06:52:33 mlarkin Exp $ */ +/* $OpenBSD: conf.c,v 1.47 2019/06/08 02:52:20 jsg Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -40,7 +40,7 @@ #include <biosdev.h> #include <dev/cons.h> -const char version[] = "3.44"; +const char version[] = "3.45"; int debug = 1; diff --git a/sys/arch/amd64/stand/libsa/exec_i386.c b/sys/arch/amd64/stand/libsa/exec_i386.c index d8ee2e5610c..70efee2e9fd 100644 --- a/sys/arch/amd64/stand/libsa/exec_i386.c +++ b/sys/arch/amd64/stand/libsa/exec_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_i386.c,v 1.31 2019/05/28 17:38:02 mlarkin Exp $ */ +/* $OpenBSD: exec_i386.c,v 1.32 2019/06/08 02:52:20 jsg Exp $ */ /* * Copyright (c) 1997-1998 Michael Shalayeff @@ -226,7 +226,7 @@ ucode_load(void) return; buflen = sb.st_size; - if (buflen > 128*1024) { + if (buflen > 256*1024) { printf("ucode too large\n"); return; } 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; } |