[smbios] Fix SMBIOS string fetching

A bug in read_smbios_string() was causing the starting offset of the
SMBIOS structure to be added twice, resulting in completely the wrong
strings being returned.

Bug identified by Martin Herweg <m.herweg@gmx.de>

diff --git a/src/arch/i386/firmware/pcbios/smbios.c b/src/arch/i386/firmware/pcbios/smbios.c
index aa4f3f329464d3858ea00ffa619510076fe680aa..875d421b49b32f118d68b5481126a1bd080bde97 100644 (file)
--- a/src/arch/i386/firmware/pcbios/smbios.c
+++ b/src/arch/i386/firmware/pcbios/smbios.c
@@ -275,14 +275,12 @@ int read_smbios_string ( struct smbios_structure *structure,
                 * smbios_strings struct is constructed so as to
                 * always end on a string boundary.
                 */
-               string_len = strlen_user ( smbios.address,
-                                          ( structure->offset + offset ) );
+               string_len = strlen_user ( smbios.address, offset );
                if ( --index == 0 ) {
                        /* Copy string, truncating as necessary. */
                        if ( len > string_len )
                                len = string_len;
-                       copy_from_user ( data, smbios.address,
-                                        ( structure->offset + offset ), len );
+                       copy_from_user ( data, smbios.address, offset, len );
                        return string_len;
                }
        }