diff options
| author | Patrick Georgi <patrick@georgi-clan.de> | 2013-11-11 15:16:53 +0100 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-11-19 00:59:55 +0100 |
| commit | c37b05c41339acbeee00bd65c13b8a97b16854ce (patch) | |
| tree | 8fd85d7989eac5b8cd09b848705c0229d2df837d /util/nvramtool/accessors | |
| parent | ef4020957e009f2861522549927069d6e9d39959 (diff) | |
| download | coreboot-c37b05c41339acbeee00bd65c13b8a97b16854ce.tar.gz coreboot-c37b05c41339acbeee00bd65c13b8a97b16854ce.tar.bz2 coreboot-c37b05c41339acbeee00bd65c13b8a97b16854ce.zip | |
nvramtool: write size field more obviously
The field wasn't initialized in RAM first and later overwritten in a somewhat
twisted way (that relied on the size field coming after the tag field in the
struct).
Change-Id: Ibe931b297df51e3c46ae163e059338781f5a27e2
Found-by: Coverity Scan
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/4087
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'util/nvramtool/accessors')
| -rw-r--r-- | util/nvramtool/accessors/layout-bin.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/util/nvramtool/accessors/layout-bin.c b/util/nvramtool/accessors/layout-bin.c index fd3e08cdf03a..4b7f8d65585c 100644 --- a/util/nvramtool/accessors/layout-bin.c +++ b/util/nvramtool/accessors/layout-bin.c @@ -112,6 +112,7 @@ int write_cmos_layout_bin(FILE *f) sum += sizeof(table); table.header_length = sizeof(table); table.tag = LB_TAG_CMOS_OPTION_TABLE; + table.size = 0; if (fwrite((char *)&table, sizeof(table), 1, f) != 1) { perror("Error writing image file"); @@ -187,12 +188,13 @@ int write_cmos_layout_bin(FILE *f) goto err; } - if (fseek(f, sizeof(table.tag), SEEK_SET) != 0) { + if (fseek(f, 0, SEEK_SET) != 0) { perror("Error while seeking"); goto err; } - if (fwrite((char *)&sum, sizeof(table.tag), 1, f) != 1) { + table.size = sum; + if (fwrite((char *)&table, sizeof(table), 1, f) != 1) { perror("Error writing image file"); goto err; } |