Windows kernel extracts various BIOS information at boot-time.
The method it uses to extract SystemBiosDate is very hueristic.
It is done by nt!CmpGetBiosDate().
nt!CmpGetBiosDate() works by scanning all BIOS memory from 0xF0000 to
0xFFFF5 (FSEG) in search for a string which is formatted like a date.
It then chooses the string which represents the most recent date, and
writes it to:
HKLM/HARDWARE/DESCRIPTION/System SystemBiosDate
This date should usually be BiosDate located at FSEG(0xFFF5).
BIOS_DATE and RELEASE_DATE_STR appear in FSEG together with BiosDate.
This makes Windows report BIOS_DATE, which is the most recent one, as
the date in HKLM/HARDWARE/DESCRIPTION/System SystemBiosDate.
In some cases we would like to control the value that Windows will
calculate and store in SystemBiosDate (This value is popular among
activation an licensing software).
To do that we must clean FSEG from date strings which may interfere
with our intended calculation.
In this commit we remove all static dates from FSEG which are not
BiosDate.
In the next commit we will deal with dynamic strings that may sometimes
appear in FSEG (from SMBIOS tables).
Removing BIOS_DATE and RELEASE_DATE_STR static strings from FSEG will
only affect machines using legacy SMBIOS:
* SystemBiosDate will change from 04/01/2014 (BIOS_DATE) to
01/01/2011 (RELEASE_DATE_STR).
For reference implementation of nt!CmpGetBiosDate(), see ReactOS:
https://doxygen.reactos.org/d5/dd2/i386_2cmhardwr_8c.html
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk(a)oracle.com>
Reviewed-by: Arbel Moshe <arbel.moshe(a)oracle.com>
Signed-off-by: Sam Eiderman <shmuel.eiderman(a)oracle.com>
Signed-off-by: Liran Alon <liran.alon(a)oracle.com>
---
src/fw/biostables.c | 2 +-
src/fw/smbios.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/fw/biostables.c b/src/fw/biostables.c
index fe8626ef..269b8582 100644
--- a/src/fw/biostables.c
+++ b/src/fw/biostables.c
@@ -401,7 +401,7 @@ smbios_new_type_0(void *start,
}
#define BIOS_NAME "SeaBIOS"
-#define BIOS_DATE "04/01/2014"
+static const char BIOS_DATE[] = "04/01/2014";
static int
smbios_romfile_setup(void)
diff --git a/src/fw/smbios.c b/src/fw/smbios.c
index f3b5ad9d..6f33a329 100644
--- a/src/fw/smbios.c
+++ b/src/fw/smbios.c
@@ -134,7 +134,7 @@ get_external(int type, char **p, unsigned *nr_structs,
end += size; \
p->field = ++str_index; \
} else { \
- memcpy(end, def, sizeof(def)); \
+ memcpy(end, (void*)def, sizeof(def)); \
end += sizeof(def); \
p->field = ++str_index; \
} \
@@ -161,7 +161,7 @@ get_external(int type, char **p, unsigned *nr_structs,
} while (0)
/* Type 0 -- BIOS Information */
-#define RELEASE_DATE_STR "01/01/2011"
+static volatile const char RELEASE_DATE_STR[] = "01/01/2011";
static void *
smbios_init_type_0(void *start)
{
--
2.13.3
Windows kernel extracts various BIOS information at boot-time.
The method it uses to extract SystemBiosDate & SystemBiosVersion which
are then stored in:
* "HKLM\HARDWARE\DESCRIPTION\System" "SystemBiosDate"
* "HKLM\HARDWARE\DESCRIPTION\System" "SystemBiosVersion"
is very hueristic and depends on data contained in the BIOS's data
section.
The implementation resides in:
* nt!CmpGetBiosVersion()
* nt!CmpGetBiosDate()
respectively.
For reference implementation, see ReactOS:
https://doxygen.reactos.org/d5/dd2/i386_2cmhardwr_8c.html
This patch series aims to make SeaBIOS's data section interact better
with the Windows OS and report correct date & version values.
Liran Alon (4):
bios_date: Make all dates in BIOS consistent
bios_date: Make bios date appear once in the ROM
bios_date: Change BiosDate to SMBIOS bios date
bios_version: Remove misinterpreted version string
Sam Eiderman (2):
bios_date: Add bios date checks in checkrom.py
bios_version: Add bios version checks in checkrom.py
scripts/checkrom.py | 45 +++++++++++++++++++++++++++++++++++++++++++++
src/config.h | 11 +++++++++++
src/fw/biostables.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
src/fw/pciinit.c | 2 +-
src/fw/smbios.c | 21 +++++++++++++++++++--
src/misc.c | 2 +-
src/util.h | 5 +++++
7 files changed, 129 insertions(+), 8 deletions(-)
--
2.13.3
Check whenever pnp roms attempt to redirect int19, and in case it does
log a message and undo the redirect.
A pnp rom should not need this, we have BEVs and BCVs for that.
Nevertheless there are roms in the wild which are redirecting int19.
At least some BIOS implementations for physical hardware have a config
option in the setup to allow/disallow int19 redirections, so just not
allowing this seems to be the way to deal with this situation.
Buglink: https://bugzilla.redhat.com//show_bug.cgi?id=1642135
Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
src/optionroms.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/src/optionroms.c b/src/optionroms.c
index fc992f649fe1..e906ab97f433 100644
--- a/src/optionroms.c
+++ b/src/optionroms.c
@@ -8,6 +8,7 @@
#include "bregs.h" // struct bregs
#include "config.h" // CONFIG_*
#include "farptr.h" // FLATPTR_TO_SEG
+#include "biosvar.h" // GET_IVT
#include "hw/pci.h" // pci_config_readl
#include "hw/pcidevice.h" // foreachpci
#include "hw/pci_ids.h" // PCI_CLASS_DISPLAY_VGA
@@ -308,6 +309,19 @@ fail:
return NULL;
}
+static int boot_irq_captured(void)
+{
+ return GET_IVT(0x19).segoff != FUNC16(entry_19_official).segoff;
+}
+
+static void boot_irq_restore(void)
+{
+ struct segoff_s seabios;
+
+ seabios = FUNC16(entry_19_official);
+ SET_IVT(0x19, seabios);
+}
+
// Attempt to map and initialize the option rom on a given PCI device.
static void
init_pcirom(struct pci_device *pci, int isvga, u64 *sources)
@@ -327,8 +341,18 @@ init_pcirom(struct pci_device *pci, int isvga, u64 *sources)
if (! rom)
// No ROM present.
return;
+ int irq_was_captured = boot_irq_captured();
+ struct pnp_data *pnp = get_pnp_rom(rom);
setRomSource(sources, rom, RS_PCIROM | (u32)pci);
init_optionrom(rom, pci->bdf, isvga);
+ if (boot_irq_captured() && !irq_was_captured &&
+ !file && !isvga && pnp) {
+ // This PCI rom is misbehaving - recapture the boot irqs
+ char *desc = MAKE_FLATPTR(FLATPTR_TO_SEG(rom), pnp->productname);
+ dprintf(1, "PnP optionrom \"%s\" (bdf %pP) captured int19, restoring\n",
+ desc, pci);
+ boot_irq_restore();
+ }
}
--
2.18.1
Check whenever pnp roms attempt to redirect int19, and in case it does
log a message and undo the redirect.
A pnp rom should not need this, we have BEVs and BCVs for that.
Nevertheless there are roms in the wild which are redirecting int19.
At least some BIOS implementations for physical hardware have a config
option in the setup to allow/disallow int19 redirections, so just not
allowing this seems to be the way to deal with this situation.
Buglink: https://bugzilla.redhat.com//show_bug.cgi?id=1642135
Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
src/optionroms.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/src/optionroms.c b/src/optionroms.c
index fc992f649f..e90900b790 100644
--- a/src/optionroms.c
+++ b/src/optionroms.c
@@ -8,6 +8,7 @@
#include "bregs.h" // struct bregs
#include "config.h" // CONFIG_*
#include "farptr.h" // FLATPTR_TO_SEG
+#include "biosvar.h" // GET_IVT
#include "hw/pci.h" // pci_config_readl
#include "hw/pcidevice.h" // foreachpci
#include "hw/pci_ids.h" // PCI_CLASS_DISPLAY_VGA
@@ -308,6 +309,24 @@ fail:
return NULL;
}
+static int boot_irq_captured(void)
+{
+ struct segoff_s current, seabios;
+
+ current = GET_IVT(0x19);
+ seabios = FUNC16(entry_19_official);
+ return ((current.seg != seabios.seg) ||
+ (current.offset != current.offset));
+}
+
+static void boot_irq_restore(void)
+{
+ struct segoff_s seabios;
+
+ seabios = FUNC16(entry_19_official);
+ SET_IVT(0x19, seabios);
+}
+
// Attempt to map and initialize the option rom on a given PCI device.
static void
init_pcirom(struct pci_device *pci, int isvga, u64 *sources)
@@ -327,8 +346,18 @@ init_pcirom(struct pci_device *pci, int isvga, u64 *sources)
if (! rom)
// No ROM present.
return;
+ int irq_was_captured = boot_irq_captured();
+ struct pnp_data *pnp = get_pnp_rom(rom);
setRomSource(sources, rom, RS_PCIROM | (u32)pci);
init_optionrom(rom, pci->bdf, isvga);
+ if (boot_irq_captured() && !irq_was_captured &&
+ !file && !isvga && pnp) {
+ // This PCI rom is misbehaving - recapture the boot irqs
+ char *desc = MAKE_FLATPTR(FLATPTR_TO_SEG(rom), pnp->productname);
+ dprintf(1, "PnP optionrom \"%s\" (bdf %pP) captured int19, restoring\n",
+ desc, pci);
+ boot_irq_restore();
+ }
}
--
2.9.3
v2:
Offer a better commit for:
"bios_version: Remove misinterpreted version string"
Which doesn't change the debug string but rather creates the original
one dynamically.
Thanks, Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net>.
v1:
Windows kernel extracts various BIOS information at boot-time.
The method it uses to extract SystemBiosDate & SystemBiosVersion which
are then stored in:
* "HKLM\HARDWARE\DESCRIPTION\System" "SystemBiosDate"
* "HKLM\HARDWARE\DESCRIPTION\System" "SystemBiosVersion"
is very hueristic and depends on data contained in the BIOS's data
section.
The implementation resides in:
* nt!CmpGetBiosVersion()
* nt!CmpGetBiosDate()
respectively.
For reference implementation, see ReactOS:
https://doxygen.reactos.org/d5/dd2/i386_2cmhardwr_8c.html
This patch series aims to make SeaBIOS's data section interact better
with the Windows OS and report correct date & version values.
Liran Alon (4):
bios_date: Make all dates in BIOS consistent
bios_date: Make bios date appear once in the ROM
bios_date: Change BiosDate to SMBIOS bios date
bios_version: Remove misinterpreted version string
Sam Eiderman (2):
bios_date: Add bios date checks in checkrom.py
bios_version: Add bios version checks in checkrom.py
scripts/checkrom.py | 45 +++++++++++++++++++++++++++++++++++++++++++++
src/config.h | 11 +++++++++++
src/fw/biostables.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
src/fw/pciinit.c | 3 ++-
src/fw/smbios.c | 21 +++++++++++++++++++--
src/misc.c | 2 +-
src/util.h | 5 +++++
7 files changed, 130 insertions(+), 8 deletions(-)
--
2.13.3
Switch get_raw_keystroke() to return ax instead of ah, so it returns
both scan code and ascii code of the key pressed.
Add get_keystroke_full() function which passes up ax to the caller.
The get_keystroke() function continues to return the scancode only like
it did before. It is a thin wrapper around get_keystroke_full() now
though.
Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
src/util.h | 1 +
src/boot.c | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/util.h b/src/util.h
index 9c06850353a4..e2afc80c425a 100644
--- a/src/util.h
+++ b/src/util.h
@@ -36,6 +36,7 @@ int bootprio_find_pci_rom(struct pci_device *pci, int instance);
int bootprio_find_named_rom(const char *name, int instance);
struct usbdevice_s;
int bootprio_find_usb(struct usbdevice_s *usbdev, int lun);
+int get_keystroke_full(int msec);
int get_keystroke(int msec);
// bootsplash.c
diff --git a/src/boot.c b/src/boot.c
index 9f82f3ca0c3e..013d407a6449 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -441,12 +441,13 @@ get_raw_keystroke(void)
memset(&br, 0, sizeof(br));
br.flags = F_IF;
call16_int(0x16, &br);
- return br.ah;
+ return br.ax;
}
// Read a keystroke - waiting up to 'msec' milliseconds.
+// returns both scancode and ascii code.
int
-get_keystroke(int msec)
+get_keystroke_full(int msec)
{
u32 end = irqtimer_calc(msec);
for (;;) {
@@ -458,6 +459,17 @@ get_keystroke(int msec)
}
}
+// Read a keystroke - waiting up to 'msec' milliseconds.
+// returns scancode only.
+int
+get_keystroke(int msec)
+{
+ int keystroke = get_keystroke_full(msec);
+
+ if (keystroke < 0)
+ return keystroke;
+ return keystroke >> 8;
+}
/****************************************************************
* Boot menu and BCV execution
--
2.18.1
Check whenever pnp roms attempt to redirect int19, and in case it does
log a message and undo the redirect.
A pnp rom should not need this, we have BEVs and BCVs for that.
Nevertheless there are roms in the wild which are redirecting int19.
At least some BIOS implementations for physical hardware have a config
option in the setup to allow/disallow int19 redirections, so just not
allowing this seems to be the way to deal with this situation.
Buglink: https://bugzilla.redhat.com//show_bug.cgi?id=1642135
Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
---
src/optionroms.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/optionroms.c b/src/optionroms.c
index fc992f649f..4ec5504ca9 100644
--- a/src/optionroms.c
+++ b/src/optionroms.c
@@ -8,6 +8,7 @@
#include "bregs.h" // struct bregs
#include "config.h" // CONFIG_*
#include "farptr.h" // FLATPTR_TO_SEG
+#include "biosvar.h" // GET_IVT
#include "hw/pci.h" // pci_config_readl
#include "hw/pcidevice.h" // foreachpci
#include "hw/pci_ids.h" // PCI_CLASS_DISPLAY_VGA
@@ -136,9 +137,24 @@ init_optionrom(struct rom_header *rom, u16 bdf, int isvga)
tpm_option_rom(newrom, rom->size * 512);
- if (isvga || get_pnp_rom(newrom))
+ struct pnp_data *pnp = get_pnp_rom(newrom);
+ if (isvga || pnp) {
+ struct segoff_s old19, new19;
// Only init vga and PnP roms here.
+ old19 = GET_IVT(0x19);
callrom(newrom, bdf);
+ new19 = GET_IVT(0x19);
+ if (old19.seg != new19.seg ||
+ old19.offset != new19.offset) {
+ dprintf(1, "WARNING! rom tried to hijack int19 "
+ "(vec %04x:%04x, pnp %s, bev %s, bvc %s)\n",
+ new19.seg, new19.offset,
+ pnp ? "yes" : "no",
+ pnp && pnp->bev ? "yes" : "no",
+ pnp && pnp->bcv ? "yes" : "no");
+ SET_IVT(0x19, old19);
+ }
+ }
return rom_confirm(newrom->size * 512);
}
--
2.9.3
According to SMBIOS Specification, section 6.1.3 Text Strings:
"Text strings associated with a given SMBIOS structure are returned in
the dmiStructBuffer, appended directly after the formatted portion of the
structure. This method of returning string information eliminates the
need for application software to deal with pointers embedded in the
SMBIOS structure. Each string is terminated with a null (00h) BYTE and
the set of strings is terminated with an additional null (00h) BYTE”
Furthermore:
"If the formatted portion of the structure contains string-reference
fields and all the string fields are set to 0 (no string references),
the formatted section of the structure is followed by two null (00h)
BYTES"
From the above it can be seen that any SMBIOS type which contains string
references should end with an additional zero byte.
This is currently handled in all SMBIOS types which use
load_str_field_with_default() besides type0.
Therefore, add the missing zero byte to SMBIOS Type 0.
Running QEMU with:
-machine pc-i440fx-2.0 (for legacy smbios)
-smbios type=0,vendor=,version=,date= (for zero str_index)
Will cause SMBIOS type0 entry to overrun type1 entry.
Reviewed-by: Ross Philipson <ross.philipson(a)oracle.com>
Reviewed-By: Liran Alon <liran.alon(a)oracle.com>
Signed-off-by: Sam Eiderman <shmuel.eiderman(a)oracle.com>
---
src/fw/smbios.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/fw/smbios.c b/src/fw/smbios.c
index f3b5ad9d..62a563b2 100644
--- a/src/fw/smbios.c
+++ b/src/fw/smbios.c
@@ -205,6 +205,10 @@ smbios_init_type_0(void *start)
*end = 0;
end++;
+ if (!str_index) {
+ *end = 0;
+ end++;
+ }
return end;
}
--
2.13.3
