summaryrefslogtreecommitdiff
path: root/gpxe/src/arch/i386/firmware/pcbios
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-06-13 16:20:05 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-06-13 16:20:05 -0700
commit958ddda00522f768bf9adc86c0d5b446e0a672cf (patch)
treed03715b7cbd8580f90ebb231fcc987137776b3f7 /gpxe/src/arch/i386/firmware/pcbios
parent0095d560ef91676d3a07db560f58ca83d85bff95 (diff)
downloadsyslinux-958ddda00522f768bf9adc86c0d5b446e0a672cf.tar.gz
gpxe: update gpxe to latest git
Diffstat (limited to 'gpxe/src/arch/i386/firmware/pcbios')
-rw-r--r--gpxe/src/arch/i386/firmware/pcbios/smbios.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/gpxe/src/arch/i386/firmware/pcbios/smbios.c b/gpxe/src/arch/i386/firmware/pcbios/smbios.c
index aa4f3f32..875d421b 100644
--- a/gpxe/src/arch/i386/firmware/pcbios/smbios.c
+++ b/gpxe/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;
}
}