These two fixes are the final two outstanding issues in tools/firmware. They are both quite minor. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> -- 1.7.10.4
Andrew Cooper
2013-Nov-25 11:04 UTC
[PATCH 1/2] firmware/tcgbios: Prevent integer truncation in the return value
rc inside the function is uint32_t. None of the callers check the return value.
Coverity ID: 1055442
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <JBeulich@suse.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
tools/firmware/rombios/32bit/tcgbios/tcgbios.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/firmware/rombios/32bit/tcgbios/tcgbios.c
b/tools/firmware/rombios/32bit/tcgbios/tcgbios.c
index d5e2202..01d4f2f 100644
--- a/tools/firmware/rombios/32bit/tcgbios/tcgbios.c
+++ b/tools/firmware/rombios/32bit/tcgbios/tcgbios.c
@@ -428,7 +428,7 @@ uint32_t tcpa_get_laml(void)
* data : pointer to the data (i.e., string) to be added to the log
* length : length of the data
*/
-static uint16_t
+static uint32_t
tcpa_add_measurement_to_log(uint32_t pcrIndex,
uint32_t event_type,
uint32_t event_id,
--
1.7.10.4
Andrew Cooper
2013-Nov-25 11:04 UTC
[PATCH 2/2] firmware/vgabios: Fix incorrect formatting string
bios_len is an long, so requires %ld rather than %d.
Coverity ID: 1055813
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <JBeulich@suse.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
tools/firmware/vgabios/biossums.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/firmware/vgabios/biossums.c
b/tools/firmware/vgabios/biossums.c
index d5816f4..6288498 100644
--- a/tools/firmware/vgabios/biossums.c
+++ b/tools/firmware/vgabios/biossums.c
@@ -161,7 +161,7 @@ int main(int argc, char* argv[])
exit(EXIT_FAILURE);
}
if (fwrite(bios_data, 1, bios_len, stream) < bios_len) {
- printf("Error writing %d KBytes to %s.\n", bios_len / 1024,
argv[1]);
+ printf("Error writing %ld KBytes to %s.\n", bios_len / 1024,
argv[1]);
fclose(stream);
exit(EXIT_FAILURE);
}
--
1.7.10.4
Ian Campbell
2013-Nov-26 11:13 UTC
Re: [PATCH 1/2] firmware/tcgbios: Prevent integer truncation in the return value
On Mon, 2013-11-25 at 11:04 +0000, Andrew Cooper wrote:> rc inside the function is uint32_t. None of the callers check the return value.Makes me wonder if chaigng to returning void might have been better, but any way, I acked and applied this and hte second one.> > Coverity ID: 1055442 > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > CC: Keir Fraser <keir@xen.org> > CC: Jan Beulich <JBeulich@suse.com> > CC: Ian Campbell <Ian.Campbell@citrix.com> > CC: Ian Jackson <Ian.Jackson@eu.citrix.com> > --- > tools/firmware/rombios/32bit/tcgbios/tcgbios.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/firmware/rombios/32bit/tcgbios/tcgbios.c b/tools/firmware/rombios/32bit/tcgbios/tcgbios.c > index d5e2202..01d4f2f 100644 > --- a/tools/firmware/rombios/32bit/tcgbios/tcgbios.c > +++ b/tools/firmware/rombios/32bit/tcgbios/tcgbios.c > @@ -428,7 +428,7 @@ uint32_t tcpa_get_laml(void) > * data : pointer to the data (i.e., string) to be added to the log > * length : length of the data > */ > -static uint16_t > +static uint32_t > tcpa_add_measurement_to_log(uint32_t pcrIndex, > uint32_t event_type, > uint32_t event_id,