public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: "André Draszik" <git@andred.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 5/5] tpm: add more missing va_end()
Date: Tue,  3 Oct 2017 16:52:28 +0100	[thread overview]
Message-ID: <20171003155228.9702-5-git@andred.net> (raw)
In-Reply-To: <20171003155228.9702-1-git@andred.net>

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(-)

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':
-- 
2.14.2

  parent reply	other threads:[~2017-10-03 15:52 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-03 15:52 [U-Boot] [PATCH 1/5] SPL: fix printing of image name André Draszik
2017-10-03 15:52 ` [U-Boot] [PATCH 2/5] tpm: fix reading of permanent flags André Draszik
2017-10-03 15:52 ` [U-Boot] [PATCH 3/5] tpm: add tpm_get_random() André Draszik
2017-10-03 15:52 ` [U-Boot] [PATCH 4/5] tpm: add more useful NV storage permission flags André Draszik
2017-11-17 14:05   ` Simon Glass
2017-11-17 15:41     ` sjg at google.com
2017-10-03 15:52 ` André Draszik [this message]
2017-10-03 15:55 ` [U-Boot] [PATCH v2 1/5] SPL: fix printing of image name André Draszik
2017-10-03 15:55   ` [U-Boot] [PATCH v2 2/5] tpm: fix reading of permanent flags André Draszik
2017-11-17 14:05     ` Simon Glass
2017-11-17 15:41       ` sjg at google.com
2017-10-03 15:55   ` [U-Boot] [PATCH v2 3/5] tpm: add tpm_get_random() André Draszik
2017-11-17 14:05     ` Simon Glass
2017-11-17 15:41       ` sjg at google.com
2017-11-17 15:47         ` Simon Glass
2017-10-03 15:55   ` [U-Boot] [PATCH v2 4/5] tpm: add more useful NV storage permission flags André Draszik
2017-10-03 15:55   ` [U-Boot] [PATCH v2 5/5] tpm: add more missing va_end() André Draszik
2017-11-17 14:06     ` Simon Glass
2017-11-17 15:41       ` sjg at google.com
2017-11-01  9:09   ` [U-Boot] [PATCH v2 1/5] SPL: fix printing of image name André Draszik
2017-11-17 14:05     ` Simon Glass
2017-11-17 15:41       ` sjg at google.com

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171003155228.9702-5-git@andred.net \
    --to=git@andred.net \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox