Steven Sherk e17843c4a7 cbfs: Fix overwalk on file scan ... A bootblock overwalk was occuring when deriving the actual length, the bootblock size was not taken into account and bootblock size was not aligned. Resolved merge conflict. Change-Id: I7eb42f8deaaf223dcf07b37bb7dde4643acd508f Signed-off-by: Steven Sherk <steven.sherk@se-eng.com> Reviewed-on: https://gerrit.chromium.org/gerrit/65989 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Commit-Queue: Steve Sherk <ssherk70@gmail.com> Tested-by: Steve Sherk <ssherk70@gmail.com> (cherry picked from commit 20b0ba479b01755fbdc7f3dd9214e8af923402ba) Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com> Reviewed-on: http://review.coreboot.org/6539 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>		2014-08-10 22:25:07 +02:00
..
bayou	GPLv2 notice: Unify all files to just use one space in »MA 02110-1301«	2013-03-01 10:16:08 +01:00
coreinfo	payloads/coreinfo/multiboot_module.c: Trivial fix indents	2014-05-23 09:50:21 +02:00
external	payloads/external/SeaBIOS: Use coreboot’s serial console settings	2014-07-31 19:03:16 +02:00
libpayload	cbfs: Fix overwalk on file scan	2014-08-10 22:25:07 +02:00
nvramcui	nvramcui: Trim values when setting.	2014-01-19 15:09:29 +01:00
tianocoreboot	GPLv2 notice: Unify all files to just use one space in »MA 02110-1301«	2013-03-01 10:16:08 +01:00