From patchwork Thu Sep 8 16:27:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 9321837 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9DF666077F for ; Thu, 8 Sep 2016 17:29:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 901B429974 for ; Thu, 8 Sep 2016 17:29:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 851932997A; Thu, 8 Sep 2016 17:29:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3C14629974 for ; Thu, 8 Sep 2016 17:29:20 +0000 (UTC) Received: from localhost ([::1]:49816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi38Z-0002c9-9E for patchwork-qemu-devel@patchwork.kernel.org; Thu, 08 Sep 2016 13:29:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi2Ar-00010c-R6 for qemu-devel@nongnu.org; Thu, 08 Sep 2016 12:27:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bi2Ao-00076D-RK for qemu-devel@nongnu.org; Thu, 08 Sep 2016 12:27:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi2Ao-000768-LX for qemu-devel@nongnu.org; Thu, 08 Sep 2016 12:27:34 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 515DF62657 for ; Thu, 8 Sep 2016 16:27:34 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-7-226.ams2.redhat.com [10.36.7.226]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u88GRUvh005412; Thu, 8 Sep 2016 12:27:33 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 8 Sep 2016 17:27:23 +0100 Message-Id: <1473352047-908-3-git-send-email-berrange@redhat.com> In-Reply-To: <1473352047-908-1-git-send-email-berrange@redhat.com> References: <1473352047-908-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 08 Sep 2016 16:27:34 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/6] crypto: clear out buffer after timing pbkdf algorithm X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The 'out' buffer will hold a key derived from master password, so it is best practice to clear this buffer when no longer required. Signed-off-by: Daniel P. Berrange Reviewed-by: Eric Blake --- crypto/pbkdf.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/crypto/pbkdf.c b/crypto/pbkdf.c index 695cc35..35dccc2 100644 --- a/crypto/pbkdf.c +++ b/crypto/pbkdf.c @@ -67,13 +67,14 @@ int qcrypto_pbkdf2_count_iters(QCryptoHashAlgorithm hash, const uint8_t *salt, size_t nsalt, Error **errp) { + int ret = -1; uint8_t out[32]; long long int iterations = (1 << 15); unsigned long long delta_ms, start_ms, end_ms; while (1) { if (qcrypto_pbkdf2_get_thread_cpu(&start_ms, errp) < 0) { - return -1; + goto cleanup; } if (qcrypto_pbkdf2(hash, key, nkey, @@ -81,10 +82,10 @@ int qcrypto_pbkdf2_count_iters(QCryptoHashAlgorithm hash, iterations, out, sizeof(out), errp) < 0) { - return -1; + goto cleanup; } if (qcrypto_pbkdf2_get_thread_cpu(&end_ms, errp) < 0) { - return -1; + goto cleanup; } delta_ms = end_ms - start_ms; @@ -103,8 +104,12 @@ int qcrypto_pbkdf2_count_iters(QCryptoHashAlgorithm hash, if (iterations > INT32_MAX) { error_setg(errp, "Iterations %lld too large for a 32-bit int", iterations); - return -1; + goto cleanup; } - return iterations; + ret = iterations; + + cleanup: + memset(out, 0, sizeof(out)); + return ret; }