diff mbox series

[U-Boot,v2,5/5] tpm: add more missing va_end()

Message ID 20171003155554.10705-5-git@andred.net
State Accepted
Delegated to: Simon Glass
Headers show
Series [U-Boot,v2,1/5] SPL: fix printing of image name | expand

Commit Message

André Draszik Oct. 3, 2017, 3:55 p.m. UTC 
From: André Draszik <adraszik@tycoint.com>

While commit 36d35345b1f6 ("tpm: add missing va_end") added
some missing calls to va_end(), it missed a few places.

Signed-off-by: André Draszik <adraszik@tycoint.com>
---
 lib/tpm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Simon Glass Nov. 17, 2017, 2:06 p.m. UTC | #1 
On 3 October 2017 at 09:55, André Draszik <git@andred.net> wrote:
> From: André Draszik <adraszik@tycoint.com>
>
> While commit 36d35345b1f6 ("tpm: add missing va_end") added
> some missing calls to va_end(), it missed a few places.
>
> Signed-off-by: André Draszik <adraszik@tycoint.com>
> ---
>  lib/tpm.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Acked-by: Simon Glass <sjg@chromium.org>
Simon Glass Nov. 17, 2017, 3:41 p.m. UTC | #2 
On 3 October 2017 at 09:55, André Draszik <git@andred.net> wrote:
> From: André Draszik <adraszik@tycoint.com>
>
> While commit 36d35345b1f6 ("tpm: add missing va_end") added
> some missing calls to va_end(), it missed a few places.
>
> Signed-off-by: André Draszik <adraszik@tycoint.com>
> ---
>  lib/tpm.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-dm thanks!
diff mbox series

Patch

diff --git a/lib/tpm.c b/lib/tpm.c
index 42a6591f81..f461e639e0 100644
--- a/lib/tpm.c
+++ b/lib/tpm.c
@@ -92,6 +92,7 @@  int pack_byte_string(uint8_t *str, size_t size, const char *format, ...)
 			break;
 		default:
 			debug("Couldn't recognize format string\n");
+			va_end(args);
 			return -1;
 		}
 
@@ -170,8 +171,10 @@  int unpack_byte_string(const uint8_t *str, size_t size, const char *format, ...)
 			return -1;
 		}
 
-		if (offset + length > size)
+		if (offset + length > size) {
+			va_end(args);
 			return -1;
+		}
 
 		switch (*format) {
 		case 'b':