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

util/cbmem: Don't output trailing garbage for cbmemc 

Current code outputs the whole cbmemc buffer even if only part of
it is really used. Fix it to output only the used part and notify
the user if the buffer was too small for the required data.

Change-Id: I68c1970cf84d49b2d7d6007dae0679d7a7a0cb99
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/2991
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Vladimir Serbinenko 2013-03-30 12:15:12 +01:00 committed by Ronald G. Minnich
parent 33e83caff5
commit f4a0d019fa
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/cbmem/cbmem.c
View File

@ -314,6 +314,7 @@ static void dump_console(void)
void *console_p; void *console_p;
char *console_c; char *console_c;
uint32_t size; uint32_t size;
uint32_t cursor;
if (console.tag != LB_TAG_CBMEM_CONSOLE) { if (console.tag != LB_TAG_CBMEM_CONSOLE) {
fprintf(stderr, "No console found in coreboot table.\n"); fprintf(stderr, "No console found in coreboot table.\n");
@ -328,6 +329,12 @@ static void dump_console(void)
* Hence we have to add 8 to get to the actual console string. * Hence we have to add 8 to get to the actual console string.
*/ */
size = *(uint32_t *)console_p; size = *(uint32_t *)console_p;
cursor = *(uint32_t *) (console_p + 4);
/* Cursor continues to go on even after no more data fits in
* the buffer but the data is dropped in this case.
*/
if (size > cursor)
size = cursor;
console_c = malloc(size + 1); console_c = malloc(size + 1);
if (!console_c) { if (!console_c) {
fprintf(stderr, "Not enough memory for console.\n"); fprintf(stderr, "Not enough memory for console.\n");
@ -337,7 +344,10 @@ static void dump_console(void)
memcpy(console_c, console_p + 8, size); memcpy(console_c, console_p + 8, size);
console_c[size] = 0; console_c[size] = 0;
printf("%s", console_c); printf("%s\n", console_c);
if (size < cursor)
printf("%d %s lost\n", cursor - size,
(cursor - size) == 1 ? "byte":"bytes");
free(console_c); free(console_c);