From patchwork Tue Aug 20 14:49:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 820611 Delivered-To: patch@linaro.org Received: by 2002:adf:e98a:0:b0:367:895a:4699 with SMTP id h10csp264869wrm; Tue, 20 Aug 2024 07:51:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXRYMQb8tP7iZ7lrioR++8RblWboBaYyri0zzAcloFKLUX+yoR8ltApMtIE4M3yHGUwhZDOobGKAKGqK39uBYQK X-Google-Smtp-Source: AGHT+IEoKdzLk8wyVK7mlhV/xNcpP+p6VPOeB/2FXkb1EzFYHlUd5bJDZbdi2+cuoCQcm2Kkdem0 X-Received: by 2002:a05:6359:5a8a:b0:1ab:e07d:c945 with SMTP id e5c5f4694b2df-1b39316972amr1900481755d.1.1724165481386; Tue, 20 Aug 2024 07:51:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1724165481; cv=none; d=google.com; s=arc-20160816; b=tUHMry7E0+FZjLH7OxeRoi5zNiGWPzh6ra5y+qrTd+392aXwFVaBLUnwyd8WpPzacQ DIy8C/ZTPz6wa2YP39j5cqqjK9+BIdkW+VUZ4Jugh/kooFozeiIKF6+zuup96oFj7OZA DbL/rT9UUUSnG9JzzZJlpuE41I0BFcril4BFp4AlizWa628LODt0XDcXwtzGO44BGqlw t3+Mykj2UMAinwwTmYH1dc2AWfbyP+aGa/ZBXmRw1DxDDLdf94HePMvnSo6QE6t7flU7 90/Z5c6t9z4KXqE8gWtTFDr63ek+lXpEjSIjqvJ1MMDHe3LciGa7UlYc0cfqg0zDkZ+P w17g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=sHKOV9DrTuAZNRw2GxXIgrum/jUoQJEGc0lRLc3B+xc=; fh=E2161ijGZj5YWQ6mDoqZRzgVJNPP9w9b1pumotWVFdc=; b=B8bhzk6GASks0vomPXkn9A8iWK28aRI/O7Rqp1z/LsZZRCEp3WXTW/U1QlXqmFdkJq 9RM4EOWDxeSFv4yp3NmwZ2M0FAMTqWZj7hspIuKNleMzfkVndrxye2Ku0w32TsK0pm29 bUxOYhVBsbY2Pky0szZ0VegYAiIgmNPu5gE2J9nRuDJwwvKK+pHgG9+R0D9F0aGlXtKE SI1Y6h6M1Ua4oy6cliuoskv1HrQlzZqy0YTYbbC6DahDbn2SVeHBbFKRaa5mNum25rD5 javv+Mt50RdiFDB1Z7//8ULEvUn7NQZX41CBgju7xywmARQiwqJa/VjonN3otGQnUCtb AqKg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fm3w8hF2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a4ff0e5d58si1393002485a.452.2024.08.20.07.51.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Aug 2024 07:51:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fm3w8hF2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sgQBD-0006hs-Di; Tue, 20 Aug 2024 10:49:51 -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 1sgQAx-0005rj-3W for qemu-devel@nongnu.org; Tue, 20 Aug 2024 10:49:39 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sgQAh-0006L7-I6 for qemu-devel@nongnu.org; Tue, 20 Aug 2024 10:49:34 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4281faefea9so44578755e9.2 for ; Tue, 20 Aug 2024 07:49:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724165356; x=1724770156; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sHKOV9DrTuAZNRw2GxXIgrum/jUoQJEGc0lRLc3B+xc=; b=fm3w8hF2hgmf4pLuC8Yy7dSSfSLfGCEXrNrodmfaVPyxU/USdEMuXMqsPn585plWpV YQWQJkh0PW3ei0wTVES2/rhreXeJe4iDQVD7sLFsxQGaJR8nZRGXKOEgTlBab4477ZRu bFSuIVFJtmlUXrcTylWS5QgrcL12Clr3EHdnXiJ8ku3QBS/OGiGC4CdbzXZI7/4owtG9 TxAzE5GXgN+oLdvZUxBaMrIyKlAT4TR5R35/2EfwbjrQp6tWFTYShlUZoBL1PSf4EBcu gw0pz9Y+h1H+W4DORDnCLMdDs6+5o0WR+31uZK+QYEqAlxoqKsdZYa8xJMCx3eAgM96D rhpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724165356; x=1724770156; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sHKOV9DrTuAZNRw2GxXIgrum/jUoQJEGc0lRLc3B+xc=; b=ro05fV3ABa+6lfeGqiMgAlNCxK3WgaDrB8tFhaWo9YL7o/CQZleutMsahmpM5jHfFd HCTiV0Xq5WJuGwrGDJ50Nl3nf8zZT+rICTIXpd1L5r787RCtwWrjYW/016v0aX2gBtnX zLPJZDL6ildZwcpLlFy0DydE8kri1DKkcKzFRkxYE90bwK4UazFPwkosNcpM+CinwpdH NIeJ73uTdcO8tRYFAeYUkaGhUdk9sxG0YilWdgcvmLRz5Cu+/RMN8SjjokKaew0p8kON OKe1yAN+Yv4EFzJ2PMzxEJJh8WRlZEElmriB7hImmb2oK/DaSHKHGI67cAq7l46mh5yH 7iCA== X-Gm-Message-State: AOJu0YzyPTR9tnGG0JhH7wlo6sHlePunu58yeNr5+ri6M+u/vkEUPPzS ECBLub4wurc7MKZp3NbHaauMt3/RN0IEx3R9pDzAIN7P4P2Wzw9M4Vcwhb614m1xEC4NRgxa2jf 7 X-Received: by 2002:a5d:408a:0:b0:371:8e77:92f with SMTP id ffacd0b85a97d-371946dc42emr7630739f8f.61.1724165356481; Tue, 20 Aug 2024 07:49:16 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3718983a306sm13334672f8f.15.2024.08.20.07.49.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 07:49:16 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Peter Xu , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH for-9.2 5/9] tests/qtest/migration-test: Free QCRyptoTLSTestCertReq objects Date: Tue, 20 Aug 2024 15:49:08 +0100 Message-Id: <20240820144912.320744-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240820144912.320744-1-peter.maydell@linaro.org> References: <20240820144912.320744-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In the migration test we create several TLS certificates with the TLS_* macros from crypto-tls-x509-helpers.h. These macros create both a QCryptoTLSCertReq object which must be deinitialized and also an on-disk certificate file. The migration test currently removes the on-disk file in test_migrate_tls_x509_finish() but never deinitializes the QCryptoTLSCertReq, which means that memory allocated as part of it is leaked: Indirect leak of 2 byte(s) in 1 object(s) allocated from: #0 0x5558ba33712e in malloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/tests/qtest/migration-test+0x22f12e) (BuildId: 4c8618f663e538538cad19d35233124cea161491) #1 0x7f64afc131f4 (/lib/x86_64-linux-gnu/libtasn1.so.6+0x81f4) (BuildId: 2fde6ecb43c586fe4077118f771077aa1298e7ea) #2 0x7f64afc18d58 in asn1_write_value (/lib/x86_64-linux-gnu/libtasn1.so.6+0xdd58) (BuildId: 2fde6ecb43c586fe4077118f771077aa1298e7ea) #3 0x7f64af8fc678 in gnutls_x509_crt_set_version (/lib/x86_64-linux-gnu/libgnutls.so.30+0xe7678) (BuildId: 97b8f99f392f1fd37b969a7164bcea884e23649b) #4 0x5558ba470035 in test_tls_generate_cert tests/unit/crypto-tls-x509-helpers.c:234:5 #5 0x5558ba464e4a in test_migrate_tls_x509_start_common tests/qtest/migration-test.c:1058:5 #6 0x5558ba462c8a in test_migrate_tls_x509_start_default_host tests/qtest/migration-test.c:1123:12 #7 0x5558ba45ab40 in test_precopy_common tests/qtest/migration-test.c:1786:21 #8 0x5558ba450015 in test_precopy_unix_tls_x509_default_host tests/qtest/migration-test.c:2077:5 #9 0x5558ba46d3c7 in migration_test_wrapper tests/qtest/migration-helpers.c:456:5 (and similar reports). The only function currently provided to deinit a QCryptoTLSCertReq is test_tls_discard_cert(), which also removes the on-disk certificate file. For the migration tests we need to retain the on-disk files until we've finished running the test, so the simplest fix is to provide a new function test_tls_deinit_cert() which does only the cleanup of the QCryptoTLSCertReq, and call it in the right places. Signed-off-by: Peter Maydell Reviewed-by: Fabiano Rosas --- tests/unit/crypto-tls-x509-helpers.h | 6 ++++++ tests/qtest/migration-test.c | 3 +++ tests/unit/crypto-tls-x509-helpers.c | 12 ++++++++++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tests/unit/crypto-tls-x509-helpers.h b/tests/unit/crypto-tls-x509-helpers.h index 562c1606535..2a0f7c04fd8 100644 --- a/tests/unit/crypto-tls-x509-helpers.h +++ b/tests/unit/crypto-tls-x509-helpers.h @@ -73,6 +73,12 @@ void test_tls_generate_cert(QCryptoTLSTestCertReq *req, void test_tls_write_cert_chain(const char *filename, gnutls_x509_crt_t *certs, size_t ncerts); +/* + * Deinitialize the QCryptoTLSTestCertReq, but don't delete the certificate + * file on disk. (The caller is then responsible for doing that themselves. + */ +void test_tls_deinit_cert(QCryptoTLSTestCertReq *req); +/* Deinit the QCryptoTLSTestCertReq, and delete the certificate file */ void test_tls_discard_cert(QCryptoTLSTestCertReq *req); void test_tls_init(const char *keyfile); diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 9811047eeb4..a659609ccb0 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1062,12 +1062,15 @@ test_migrate_tls_x509_start_common(QTestState *from, QCRYPTO_TLS_TEST_CLIENT_HOSTILE_NAME : QCRYPTO_TLS_TEST_CLIENT_NAME, data->clientcert); + test_tls_deinit_cert(&servercertreq); } TLS_CERT_REQ_SIMPLE_SERVER(clientcertreq, cacertreq, data->servercert, args->certhostname, args->certipaddr); + test_tls_deinit_cert(&clientcertreq); + test_tls_deinit_cert(&cacertreq); qtest_qmp_assert_success(from, "{ 'execute': 'object-add'," diff --git a/tests/unit/crypto-tls-x509-helpers.c b/tests/unit/crypto-tls-x509-helpers.c index 3e74ec5b5d4..b316155d6a6 100644 --- a/tests/unit/crypto-tls-x509-helpers.c +++ b/tests/unit/crypto-tls-x509-helpers.c @@ -502,8 +502,7 @@ void test_tls_write_cert_chain(const char *filename, g_free(buffer); } - -void test_tls_discard_cert(QCryptoTLSTestCertReq *req) +void test_tls_deinit_cert(QCryptoTLSTestCertReq *req) { if (!req->crt) { return; @@ -511,6 +510,15 @@ void test_tls_discard_cert(QCryptoTLSTestCertReq *req) gnutls_x509_crt_deinit(req->crt); req->crt = NULL; +} + +void test_tls_discard_cert(QCryptoTLSTestCertReq *req) +{ + if (!req->crt) { + return; + } + + test_tls_deinit_cert(req); if (getenv("QEMU_TEST_DEBUG_CERTS") == NULL) { unlink(req->filename);