From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F88F606A31D for ; Fri, 23 Oct 2026 14:14:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=esEo5eQF Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xKG1D-00026A-Tz; Fri, 23 Oct 2026 10:13:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xKG1A-00025u-VJ for qemu-devel@nongnu.org; Fri, 23 Oct 2026 10:13:13 -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 1xKG19-0006Om-4U for qemu-devel@nongnu.org; Fri, 23 Oct 2026 10:13:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1792764790; 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=TOCcNfqLKWV1zES0pDhH1Ytjdm1H1/W9TCIQTFWyoTc=; b=esEo5eQFEcAR5CWXK9+xEql3rD3N4NOO+T5cHi92nWM5H2X/whjl8fdxQu4pIjCunRVc+C 8lYEsbZyLorE051fPihwXPwCf66QkGiQWaPYdqrTSTZ9T6lupphNDRYHoCZ3hlQP5I/f0e KdjdTXTrwkGtO5Yp5LBa/LF2AkoTi9k= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-350-uMHhS_fyOtmNkeR4VLmb4A-1; Fri, 23 Oct 2026 10:13:08 -0400 X-MC-Unique: uMHhS_fyOtmNkeR4VLmb4A-1 X-Mimecast-MFC-AGG-ID: uMHhS_fyOtmNkeR4VLmb4A_1792764787 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C33DB1800BEE for ; Fri, 23 Oct 2026 14:13:07 +0000 (UTC) Received: from berrange.csb (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CBC441956089; Fri, 23 Oct 2026 14:13:05 +0000 (UTC) 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 1/2] crypto: avoid overwriting Error object erasing keyslot Date: Fri, 23 Oct 2026 15:13:02 +0100 Message-ID: <20261023141303.163893-2-berrange@redhat.com> In-Reply-To: <20261023141303.163893-1-berrange@redhat.com> References: <20261023141303.163893-1-berrange@redhat.com> X-Archived-By: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.339, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org X-Spam-Status: No, score=-21.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 When erasing a keyslot we deliberately ignore some errors and carry on trying to erase as much as possible. This results in overwriting Error objects and triggering an assertion. Don't pass in the &local_err, if errp is already set. Fixes: https://gitlab.com/qemu-project/qemu/-/work_items/4697 Signed-off-by: Daniel P. Berrangé --- crypto/block-luks.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/crypto/block-luks.c b/crypto/block-luks.c index 0926ad28f0c..8a1df846a14 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -1152,22 +1152,29 @@ qcrypto_block_luks_erase_key(QCryptoBlock *block, if (ret < 0) { error_propagate(errp, local_err); + local_err = NULL; } + /* * Now try to erase the key material, even if the header * update failed */ for (i = 0; i < QCRYPTO_BLOCK_LUKS_ERASE_ITERATIONS; i++) { if (qcrypto_random_bytes(garbagesplitkey, - splitkeylen, &local_err) < 0) { + splitkeylen, + errp && *errp ? NULL : &local_err) < 0) { /* * If we failed to get the random data, still write * at least zeros to the key slot at least once */ - error_propagate(errp, local_err); + if (local_err) { + error_propagate(errp, local_err); + } if (i > 0) { return -1; + } else { + local_err = NULL; } } if (writefunc(block, @@ -1175,8 +1182,10 @@ qcrypto_block_luks_erase_key(QCryptoBlock *block, garbagesplitkey, splitkeylen, opaque, - &local_err) < 0) { - error_propagate(errp, local_err); + errp && *errp ? NULL : &local_err) < 0) { + if (local_err) { + error_propagate(errp, local_err); + } return -1; } } -- 2.56.0