From nobody Tue Oct 22 22:31:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1728997048; cv=none; d=zohomail.com; s=zohoarc; b=YAbySWIjSWqhqyy+daqDta52q3ZjKp703Z4uaf/o5jTxI2wyOYDOKLUpViubL9uRMu/oaKmfkfsPpuydvOyF2/PZH2vDIk3YnTWxN/62P9l6DSKSAnQBgatJqvtUkbK/FmIkd/CEwmnqd4OtEtLK1kZADKD013mycEkUHw4N9D0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1728997048; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=84N2rxqupBUcdaTpHle3WoL4A06cF9MmgU6vQgWoN4s=; b=P5kcxPNjZhkgNk9xWlln825S/fEv+6QpPnYxrzJAxNkeq/7IRVsyEneay1GwDvf4Qty7GWB8f56A1PaINarf2hA05/h3QYvEgTWorD9zswEMxkrdguPztIfePWp2YgO6wca7T7/xRo+YbYpblL60lkg40DaPxfP2RCPuCnGnwBo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1728997048437928.2707035576774; Tue, 15 Oct 2024 05:57:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0h6Q-0002s7-Oo; Tue, 15 Oct 2024 08:56:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0h6P-0002ru-Gw for qemu-devel@nongnu.org; Tue, 15 Oct 2024 08:56:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0h6O-0006pZ-1s for qemu-devel@nongnu.org; Tue, 15 Oct 2024 08:56:41 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-674-g51nGSlsM9e-jtpj2re87Q-1; Tue, 15 Oct 2024 08:56:36 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1567F1956077; Tue, 15 Oct 2024 12:56:35 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.118]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6913F3000198; Tue, 15 Oct 2024 12:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728996999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=84N2rxqupBUcdaTpHle3WoL4A06cF9MmgU6vQgWoN4s=; b=d9DEi1vc+8tc7efV98UFsLsecJuCVMz3p+zUmqD+Yh88GmrXhv/p2azPou3ZdJ4StVF1dE pE3rc4onH+PC8kW6FR6k2Pqt4qWrG9cuOZch8YjxRWiWTvZC9Tl2qGi5PZ8qfErLEdtrIJ v2mZaNFVD1BxaNmg4khRZSEEsPN1WKg= X-MC-Unique: g51nGSlsM9e-jtpj2re87Q-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Dorjoy Chowdhury Subject: [PATCH 1/2] crypto/hash: avoid overwriting user supplied result pointer Date: Tue, 15 Oct 2024 13:56:28 +0100 Message-ID: <20241015125629.301367-2-berrange@redhat.com> In-Reply-To: <20241015125629.301367-1-berrange@redhat.com> References: <20241015125629.301367-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.063, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1728997049056116600 If the user provides a pre-allocated buffer for the hash result, we must use that rather than re-allocating a new buffer. Reported-by: Dorjoy Chowdhury Signed-off-by: Daniel P. Berrang=C3=A9 --- crypto/hash-gcrypt.c | 15 ++++++++++++--- crypto/hash-glib.c | 11 +++++++++-- crypto/hash-gnutls.c | 16 +++++++++++++--- crypto/hash-nettle.c | 14 +++++++++++--- 4 files changed, 45 insertions(+), 11 deletions(-) diff --git a/crypto/hash-gcrypt.c b/crypto/hash-gcrypt.c index ccc3cce3f8..73533a4949 100644 --- a/crypto/hash-gcrypt.c +++ b/crypto/hash-gcrypt.c @@ -103,16 +103,25 @@ int qcrypto_gcrypt_hash_finalize(QCryptoHash *hash, size_t *result_len, Error **errp) { + int ret; unsigned char *digest; gcry_md_hd_t *ctx =3D hash->opaque; =20 - *result_len =3D gcry_md_get_algo_dlen(qcrypto_hash_alg_map[hash->alg]); - if (*result_len =3D=3D 0) { + ret =3D gcry_md_get_algo_dlen(qcrypto_hash_alg_map[hash->alg]); + if (ret =3D=3D 0) { error_setg(errp, "Unable to get hash length"); return -1; } =20 - *result =3D g_new(uint8_t, *result_len); + if (*result_len =3D=3D 0) { + *result_len =3D ret; + *result =3D g_new(uint8_t, *result_len); + } else if (*result_len !=3D ret) { + error_setg(errp, + "Result buffer size %zu is smaller than hash %d", + *result_len, ret); + return -1; + } =20 /* Digest is freed by gcry_md_close(), copy it */ digest =3D gcry_md_read(*ctx, 0); diff --git a/crypto/hash-glib.c b/crypto/hash-glib.c index 02a6ec1edf..809cef98ae 100644 --- a/crypto/hash-glib.c +++ b/crypto/hash-glib.c @@ -99,8 +99,15 @@ int qcrypto_glib_hash_finalize(QCryptoHash *hash, return -1; } =20 - *result_len =3D ret; - *result =3D g_new(uint8_t, *result_len); + if (*result_len =3D=3D 0) { + *result_len =3D ret; + *result =3D g_new(uint8_t, *result_len); + } else if (*result_len !=3D ret) { + error_setg(errp, + "Result buffer size %zu is smaller than hash %d", + *result_len, ret); + return -1; + } =20 g_checksum_get_digest(ctx, *result, result_len); return 0; diff --git a/crypto/hash-gnutls.c b/crypto/hash-gnutls.c index 34a63994c9..99fbe824ea 100644 --- a/crypto/hash-gnutls.c +++ b/crypto/hash-gnutls.c @@ -115,14 +115,24 @@ int qcrypto_gnutls_hash_finalize(QCryptoHash *hash, Error **errp) { gnutls_hash_hd_t *ctx =3D hash->opaque; + int ret; =20 - *result_len =3D gnutls_hash_get_len(qcrypto_hash_alg_map[hash->alg]); - if (*result_len =3D=3D 0) { + ret =3D gnutls_hash_get_len(qcrypto_hash_alg_map[hash->alg]); + if (ret =3D=3D 0) { error_setg(errp, "Unable to get hash length"); return -1; } =20 - *result =3D g_new(uint8_t, *result_len); + if (*result_len =3D=3D 0) { + *result_len =3D ret; + *result =3D g_new(uint8_t, *result_len); + } else if (*result_len !=3D ret) { + error_setg(errp, + "Result buffer size %zu is smaller than hash %d", + *result_len, ret); + return -1; + } + gnutls_hash_output(*ctx, *result); return 0; } diff --git a/crypto/hash-nettle.c b/crypto/hash-nettle.c index 3b847aa60e..c78624b347 100644 --- a/crypto/hash-nettle.c +++ b/crypto/hash-nettle.c @@ -150,9 +150,17 @@ int qcrypto_nettle_hash_finalize(QCryptoHash *hash, Error **errp) { union qcrypto_hash_ctx *ctx =3D hash->opaque; - - *result_len =3D qcrypto_hash_alg_map[hash->alg].len; - *result =3D g_new(uint8_t, *result_len); + int ret =3D qcrypto_hash_alg_map[hash->alg].len; + + if (*result_len =3D=3D 0) { + *result_len =3D ret; + *result =3D g_new(uint8_t, *result_len); + } else if (*result_len !=3D ret) { + error_setg(errp, + "Result buffer size %zu is smaller than hash %d", + *result_len, ret); + return -1; + } =20 qcrypto_hash_alg_map[hash->alg].result(ctx, *result_len, *result); =20 --=20 2.46.0 From nobody Tue Oct 22 22:31:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1728997048; cv=none; d=zohomail.com; s=zohoarc; b=Nu6gDE099KvUD5AHmtCj8Htc+4OPruZCfPq6MIQhAkLA4DCsAFFNglcbnnNzjvGI84z6zb/0VyYHmec/uRicGrEZNobTMZXSAa6rjZwGtg8liibaxspJ8MaolgoKfUop7B6/UHBf3CmNSkmDjNF0olDQoGw92OY4pZuCgjtkofQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1728997048; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ENNrYL48iopybgO3xqkXmLRGJM0WPuBI+yVnGuIHfCE=; b=MyXOpg9PB8IwIljOOhoAUZx6L+Da6mMLCj3GDDpD/7uGgYiCcgQsvGnKw8Tifhs85Kk9UKTxB7rMjfB7aKsH5Yn6rf43Mhd0TyLfHbLnQVUsM3H1ODVbU2Je+7euPeTj7YLaB3ofZoq3m0F46GYmgRofVxoxGFQZl4cgYcqv9rk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1728997048437610.0268185769297; Tue, 15 Oct 2024 05:57:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0h6S-0002sJ-63; Tue, 15 Oct 2024 08:56:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0h6Q-0002s2-Hi for qemu-devel@nongnu.org; Tue, 15 Oct 2024 08:56:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0h6O-0006pd-SA for qemu-devel@nongnu.org; Tue, 15 Oct 2024 08:56:42 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-103-BXaVlxXpOD2TucmmeGl9SQ-1; Tue, 15 Oct 2024 08:56:37 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 809AF1955F79 for ; Tue, 15 Oct 2024 12:56:36 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.118]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 70A243000198; Tue, 15 Oct 2024 12:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728996999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ENNrYL48iopybgO3xqkXmLRGJM0WPuBI+yVnGuIHfCE=; b=DsLMB8xvLdonHCOZafMl3drV4ITKXN26idYN97EXE2eiZl5TqNdwwUSPyO8Wg5Tsfq0U1v BAXL4y3wriPka9gmVjw8LAZAE4uJL+y59Nq5EO0ZYr84P0fTWekMPWJz0J8w7McQQLQB3+ waxpRXg4fHm/pgsfQGS2HrQjfbEfmhk= X-MC-Unique: BXaVlxXpOD2TucmmeGl9SQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 2/2] tests: correctly validate result buffer in hash/hmac tests Date: Tue, 15 Oct 2024 13:56:29 +0100 Message-ID: <20241015125629.301367-3-berrange@redhat.com> In-Reply-To: <20241015125629.301367-1-berrange@redhat.com> References: <20241015125629.301367-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.063, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1728997049041116600 Validate that the pre-allocated buffer pointer was not overwritten by the hash/hmac APIs. Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/unit/test-crypto-hash.c | 7 ++++--- tests/unit/test-crypto-hmac.c | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/unit/test-crypto-hash.c b/tests/unit/test-crypto-hash.c index e5829ca766..76c4699c15 100644 --- a/tests/unit/test-crypto-hash.c +++ b/tests/unit/test-crypto-hash.c @@ -123,7 +123,7 @@ static void test_hash_prealloc(void) size_t i; =20 for (i =3D 0; i < G_N_ELEMENTS(expected_outputs) ; i++) { - uint8_t *result; + uint8_t *result, *origresult; size_t resultlen; int ret; size_t j; @@ -133,7 +133,7 @@ static void test_hash_prealloc(void) } =20 resultlen =3D expected_lens[i]; - result =3D g_new0(uint8_t, resultlen); + origresult =3D result =3D g_new0(uint8_t, resultlen); =20 ret =3D qcrypto_hash_bytes(i, INPUT_TEXT, @@ -142,7 +142,8 @@ static void test_hash_prealloc(void) &resultlen, &error_fatal); g_assert(ret =3D=3D 0); - + /* Validate that our pre-allocated pointer was not replaced */ + g_assert(result =3D=3D origresult); g_assert(resultlen =3D=3D expected_lens[i]); for (j =3D 0; j < resultlen; j++) { g_assert(expected_outputs[i][j * 2] =3D=3D hex[(result[j] >> 4= ) & 0xf]); diff --git a/tests/unit/test-crypto-hmac.c b/tests/unit/test-crypto-hmac.c index 3fa50f24bb..cdb8774443 100644 --- a/tests/unit/test-crypto-hmac.c +++ b/tests/unit/test-crypto-hmac.c @@ -126,7 +126,7 @@ static void test_hmac_prealloc(void) for (i =3D 0; i < G_N_ELEMENTS(test_data); i++) { QCryptoHmacTestData *data =3D &test_data[i]; QCryptoHmac *hmac =3D NULL; - uint8_t *result =3D NULL; + uint8_t *result =3D NULL, *origresult =3D NULL; size_t resultlen =3D 0; const char *exp_output =3D NULL; int ret; @@ -139,7 +139,7 @@ static void test_hmac_prealloc(void) exp_output =3D data->hex_digest; =20 resultlen =3D strlen(exp_output) / 2; - result =3D g_new0(uint8_t, resultlen); + origresult =3D result =3D g_new0(uint8_t, resultlen); =20 hmac =3D qcrypto_hmac_new(data->alg, (const uint8_t *)KEY, strlen(KEY), &error_fatal); @@ -149,6 +149,8 @@ static void test_hmac_prealloc(void) strlen(INPUT_TEXT), &result, &resultlen, &error_fatal); g_assert(ret =3D=3D 0); + /* Validate that our pre-allocated pointer was not replaced */ + g_assert(result =3D=3D origresult); =20 exp_output =3D data->hex_digest; for (j =3D 0; j < resultlen; j++) { --=20 2.46.0