From patchwork Tue Oct 3 15:55:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Draszik?= X-Patchwork-Id: 820940 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3y63yB0K0fz9t2M for ; Wed, 4 Oct 2017 03:14:25 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C2242C21FAA; Tue, 3 Oct 2017 16:10:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9BD24C21FB6; Tue, 3 Oct 2017 16:07:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5DF14C21D7B; Tue, 3 Oct 2017 15:56:02 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by lists.denx.de (Postfix) with ESMTPS id 0CDA9C21D09 for ; Tue, 3 Oct 2017 15:56:02 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id y44so1099592wry.2 for ; Tue, 03 Oct 2017 08:56:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W1mIdvjcPS0SH+ASjxYy5fj9BqxJW4UKx4vEJMdbasg=; b=BWWq5OlfihYKon5LsGd7drTet2MHAaEz4IhhnOj/4/VDpJYCUzIo/si1oiKXYglpkc 2bImJOjxLumz1HprUxyd/RLhJYKskb6vOiwE903rhUecIQ/NVvlbM6tknjJKlmtP634h c+oyaWfoyTxRz3hmQ6hqqlmQBUUU1qUQ3p8Cpy0iegPAQj2sLlyZjNRSoTPuEsgJ/AOX AEK6jNZ3AGzU2TYRfHN+a1CXfJ69tbRymIyEn7xT4AnLDlGq3SbaNX8rW35Z51CAPvV9 y6kN7dDWAL2KuXQBnA0kMyquEt6N68Vh/3+29AXAxajGMY+7J4J+ydmKs0EVUZTr6ags 9LrQ== X-Gm-Message-State: AMCzsaWkvXOavBxa2u9reW6DVpFjkxo5Q/9LyneNwKM8zWUqP2Yv5Mrt PzFgUrsH31nNnB3CWveonAu/tIEb X-Google-Smtp-Source: AOwi7QDREsfV6D/Q2cJN6Av2GxoysyiuAfkNfVwJMAcN7cQcT2dgQ8V9RFdOi0nNUhpGuUgkintt9g== X-Received: by 10.223.169.239 with SMTP id b102mr1787878wrd.171.1507046161431; Tue, 03 Oct 2017 08:56:01 -0700 (PDT) Received: from tfsielt31850.tycofs.com ([77.107.218.170]) by smtp.gmail.com with ESMTPSA id f17sm5643193wmf.47.2017.10.03.08.56.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Oct 2017 08:56:00 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= To: u-boot@lists.denx.de Date: Tue, 3 Oct 2017 16:55:54 +0100 Message-Id: <20171003155554.10705-5-git@andred.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171003155554.10705-1-git@andred.net> References: <20171003155228.9702-1-git@andred.net> <20171003155554.10705-1-git@andred.net> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 03 Oct 2017 16:07:34 +0000 Subject: [U-Boot] [PATCH v2 5/5] tpm: add more missing va_end() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: André Draszik 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 Acked-by: Simon Glass Acked-by: Simon Glass --- 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':