From 4bb9fddcf0c366008c276aee8a08590dc85ea83d Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 20 Dec 2011 15:53:20 -0800 Subject: Revert "Security: Make sure not to overflow the in memory version of the GBB" This breaks recovery mode on Kaen - the bitmaps are not displayed. This reverts commit e1153e1f56ebebff188f3693e534f10bd68e6f07 Change-Id: I300ae39382dc1960bb0375ad660a88b65181edc9 Reviewed-on: https://gerrit.chromium.org/gerrit/13274 Reviewed-by: Gabe Black (Do Not Use) Commit-Ready: Simon Glass Tested-by: Simon Glass --- include/chromeos/gbb.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'include/chromeos') diff --git a/include/chromeos/gbb.h b/include/chromeos/gbb.h index d3770f51b1a..c3bc304b38e 100644 --- a/include/chromeos/gbb.h +++ b/include/chromeos/gbb.h @@ -22,11 +22,9 @@ * @param gbb Buffer for holding GBB * @param file Flashrom device handle * @param gbb_offset Offset of GBB in flashrom device - * @param gbb_size Size of the buffer holding GBB * @return zero if this succeeds, non-zero if this fails */ -int gbb_init(read_buf_type gbb, firmware_storage_t *file, uint32_t gbb_offset, - size_t gbb_size); +int gbb_init(read_buf_type gbb, firmware_storage_t *file, uint32_t gbb_offset); #ifndef CONFIG_HARDWARE_MAPPED_SPI /** @@ -35,11 +33,10 @@ int gbb_init(read_buf_type gbb, firmware_storage_t *file, uint32_t gbb_offset, * @param gbb Buffer for holding GBB * @param file Flashrom device handle * @param gbb_offset Offset of GBB in flashrom device - * @param gbb_size Size of the buffer holding GBB * @return zero if this succeeds, non-zero if this fails */ -int gbb_read_bmp_block(read_buf_type gbb, firmware_storage_t *file, - uint32_t gbb_offset, size_t gbb_size); +int gbb_read_bmp_block(read_buf_type gbb, + firmware_storage_t *file, uint32_t gbb_offset); /* * This loads the recovery key of GBB from flashrom. @@ -47,11 +44,10 @@ int gbb_read_bmp_block(read_buf_type gbb, firmware_storage_t *file, * @param gbb Buffer for holding GBB * @param file Flashrom device handle * @param gbb_offset Offset of GBB in flashrom device - * @param gbb_size Size of the buffer holding GBB * @return zero if this succeeds, non-zero if this fails */ -int gbb_read_recovery_key(read_buf_type gbb, firmware_storage_t *file, - uint32_t gbb_offset, size_t gbb_size); +int gbb_read_recovery_key(read_buf_type gbb, + firmware_storage_t *file, uint32_t gbb_offset); #else -- cgit v1.2.3