GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chromeos: vpd: properly null terminate values 

VPD strings are not null terminated, so we can't use strcpy
on them in cros_vpd_gets.

BUG=none
BRANCH=none
TEST=add serial_number followed by cam_calib_data to VPD on smaug;
make sure that smaug boots and serial number matches exactly (no garbage)

Change-Id: Id72885517b3d0b1934ba329c1ef0d89a67bd2bb4
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 56bbe6688b11043360a046a250d1ea93db4d9f0e
Original-Change-Id: I811dfc2f0830a91410eb69961a6565080ff78267
Original-Signed-off-by: Stephen Barber <smbarber@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/280836
Original-Reviewed-by: David Hendricks <dhendrix@chromium.org>
Original-Reviewed-by: Benson Leung <bleung@chromium.org>
Reviewed-on: http://review.coreboot.org/10627
Tested-by: build bot (Jenkins)
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Stephen Barber 2015-06-19 12:56:34 -07:00 committed by Patrick Georgi
parent f4227c4b01
commit 31f8a2fe74
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/vendorcode/google/chromeos/cros_vpd.c
View File

@ -132,7 +132,8 @@ char *cros_vpd_gets(const char *key, char *buffer, int size)
return NULL; return NULL;
if (size > (string_size + 1)) { if (size > (string_size + 1)) {
strcpy(buffer, string_address); memcpy(buffer, string_address, string_size);
buffer[string_size] = '\0';
} else { } else {
memcpy(buffer, string_address, size - 1); memcpy(buffer, string_address, size - 1);
buffer[size - 1] = '\0'; buffer[size - 1] = '\0';