From nobody Tue Apr 8 18:10:38 2025 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=1677178472; cv=none; d=zohomail.com; s=zohoarc; b=IgL8RPp1Ny/Ikp1Gpktg0lKNPE8oFBLeyjykqnh0pIsfSuzNEKiuAKcoDgEVsDTD5/QDLizYM23chH4eDxlRV3a8Mqip5UQ96qXSxzwsVixmdnF3jMpcZJUxCVMyAgz1waZBSTBSWODtjQhvui89Nq1K/OLaHyzPAdkR9uMQ+yU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677178472; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oUB96iEf8D3+hhXsE8FlQ2IWhxJiAJqsEBpFmNj3UWk=; b=G4Hd4UUns17ytb17jthLn2jisCfzO1ufOTMoGTdemPk7vjfWR81UiHQ+cu3hvvt0w5tnST6wp+aNJwgMgEgY3nVjDCFpB8UyDneRwi68bDABsjzZlftv/6fTAFV5lykqalM+Ri5kmCjOYnUZpzDcBOACRWV5d+NHkaqAr1i7Tic= 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 1677178472774398.2063431061599; Thu, 23 Feb 2023 10:54:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVGhp-00078W-Uv; Thu, 23 Feb 2023 13:52:38 -0500 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 1pVGhY-0006yy-Vi for qemu-devel@nongnu.org; Thu, 23 Feb 2023 13:52:20 -0500 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 1pVGhW-0003ER-LA for qemu-devel@nongnu.org; Thu, 23 Feb 2023 13:52:20 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-14-UvlSCbezM1a4BjnqlEPB7A-1; Thu, 23 Feb 2023 13:52:16 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 74738800050; Thu, 23 Feb 2023 18:52:16 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.192.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF3981121314; Thu, 23 Feb 2023 18:52:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677178338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oUB96iEf8D3+hhXsE8FlQ2IWhxJiAJqsEBpFmNj3UWk=; b=bQJiLEy+t71ZGYFmjsHlywPPia5bw8eVxI3m+BLy5fjCZ9s2UvRZ4PdyxeOUGM+bNum54j aRtIFjQSTkJLjaFOv0VbiTmbVe7yQy9KTATdl/V95vw0oQqlK+wnrai+iiBB9vjqAIldVi pV/8tk7acN0LRx0OsN0Z+F2qkzcN3Os= X-MC-Unique: UvlSCbezM1a4BjnqlEPB7A-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Subject: [PULL 27/29] block/rbd: Remove redundant stack variable passphrase_len Date: Thu, 23 Feb 2023 19:51:44 +0100 Message-Id: <20230223185146.306454-28-kwolf@redhat.com> In-Reply-To: <20230223185146.306454-1-kwolf@redhat.com> References: <20230223185146.306454-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=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: 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: 1677178473073100001 Content-Type: text/plain; charset="utf-8" From: Or Ozeri Signed-off-by: Or Ozeri Message-Id: <20230129113120.722708-2-oro@oro.sl.cloud9.ibm.com> Reviewed-by: Ilya Dryomov Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/rbd.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 5e102fea0d..4bd75c9bb7 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -386,7 +386,6 @@ static int qemu_rbd_encryption_format(rbd_image_t image, { int r =3D 0; g_autofree char *passphrase =3D NULL; - size_t passphrase_len; rbd_encryption_format_t format; rbd_encryption_options_t opts; rbd_encryption_luks1_format_options_t luks_opts; @@ -408,12 +407,12 @@ static int qemu_rbd_encryption_format(rbd_image_t ima= ge, opts_size =3D sizeof(luks_opts); r =3D qemu_rbd_convert_luks_create_options( qapi_RbdEncryptionCreateOptionsLUKS_base(&encrypt->u.l= uks), - &luks_opts.alg, &passphrase, &passphrase_len, errp); + &luks_opts.alg, &passphrase, &luks_opts.passphrase_siz= e, + errp); if (r < 0) { return r; } luks_opts.passphrase =3D passphrase; - luks_opts.passphrase_size =3D passphrase_len; break; } case RBD_IMAGE_ENCRYPTION_FORMAT_LUKS2: { @@ -424,12 +423,12 @@ static int qemu_rbd_encryption_format(rbd_image_t ima= ge, r =3D qemu_rbd_convert_luks_create_options( qapi_RbdEncryptionCreateOptionsLUKS2_base( &encrypt->u.luks2), - &luks2_opts.alg, &passphrase, &passphrase_len, errp); + &luks2_opts.alg, &passphrase, &luks2_opts.passphrase_s= ize, + errp); if (r < 0) { return r; } luks2_opts.passphrase =3D passphrase; - luks2_opts.passphrase_size =3D passphrase_len; break; } default: { @@ -468,7 +467,6 @@ static int qemu_rbd_encryption_load(rbd_image_t image, { int r =3D 0; g_autofree char *passphrase =3D NULL; - size_t passphrase_len; rbd_encryption_luks1_format_options_t luks_opts; rbd_encryption_luks2_format_options_t luks2_opts; rbd_encryption_format_t format; @@ -483,12 +481,11 @@ static int qemu_rbd_encryption_load(rbd_image_t image, opts_size =3D sizeof(luks_opts); r =3D qemu_rbd_convert_luks_options( qapi_RbdEncryptionOptionsLUKS_base(&encrypt->u.luks), - &passphrase, &passphrase_len, errp); + &passphrase, &luks_opts.passphrase_size, errp); if (r < 0) { return r; } luks_opts.passphrase =3D passphrase; - luks_opts.passphrase_size =3D passphrase_len; break; } case RBD_IMAGE_ENCRYPTION_FORMAT_LUKS2: { @@ -498,12 +495,11 @@ static int qemu_rbd_encryption_load(rbd_image_t image, opts_size =3D sizeof(luks2_opts); r =3D qemu_rbd_convert_luks_options( qapi_RbdEncryptionOptionsLUKS2_base(&encrypt->u.luks2), - &passphrase, &passphrase_len, errp); + &passphrase, &luks2_opts.passphrase_size, errp); if (r < 0) { return r; } luks2_opts.passphrase =3D passphrase; - luks2_opts.passphrase_size =3D passphrase_len; break; } default: { --=20 2.39.2