From nobody Mon May 13 21:33:21 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=1690302370; cv=none; d=zohomail.com; s=zohoarc; b=IpYAnT2yXtMtTlnCVSCpNmfAoKCfYty7trqJA9bwAyf5Di4d3k+Nqwa9u7oXVAPA2aZ7V7yfvbhMOF+4f0Sh4tA4UpaxzKi6rhPET+2SYZJPZmStbgaPRwdWOrqzIkUTIiXKyoT0jYOfo/huCPoYUoSUtoBsONGO0pK4lX+BIOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690302370; h=Content-Type: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=U3BYkvu3CmlSAsiJPiY7vF77Ls3eEu0PFo6xuXl4dhE=; b=R0m9DBBApVg8WVTyYtHMpGttEdDtEog6v6JhaPUIVqjKmMdsm0UFShQf4OZ3OPseff/N8VEYA1NkhIG/vJfagcenI9YRwojkp5EmMRyB9WixeGu0/VQuB9xKttZhUYlCF4AInrvXphA0oqrjNuDO37L3Ir9kCriHsWwD3NEroAM= 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 1690302370504502.88757224839446; Tue, 25 Jul 2023 09:26:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOKqj-0005Nw-VF; Tue, 25 Jul 2023 12:25:25 -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 1qOKqi-0005NW-B4 for qemu-devel@nongnu.org; Tue, 25 Jul 2023 12:25:24 -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 1qOKqg-000422-42 for qemu-devel@nongnu.org; Tue, 25 Jul 2023 12:25:24 -0400 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-54--cYDspMIP3SMzAFk9wHMrA-1; Tue, 25 Jul 2023 12:25:00 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5169A80027F; Tue, 25 Jul 2023 16:25:00 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.28.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 768102166B26; Tue, 25 Jul 2023 16:24:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690302302; 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=U3BYkvu3CmlSAsiJPiY7vF77Ls3eEu0PFo6xuXl4dhE=; b=Wsy4doSC/GUV8KD/LIDXlzFx0X6liietQy4AIkuwK0r43jfOd7u94GCqawnKpH5fV+XzYk b9GHJRJMOOmiLjTbjWwmRR2DuYF5nC+jEROEjhZEaa6sLvNUUmYJUGtX6hBzodUVQFxcC1 DGk7kuIofaIaC5ZypLbiIZVPoSTv4rE= X-MC-Unique: -cYDspMIP3SMzAFk9wHMrA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Canokeys.org" , Gerd Hoffmann , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Hongren (Zenithal) Zheng" , Akihiko Odaki Subject: [PULL 1/2] crypto: Always initialize splitkeylen Date: Tue, 25 Jul 2023 17:24:56 +0100 Message-ID: <20230725162457.156429-2-berrange@redhat.com> In-Reply-To: <20230725162457.156429-1-berrange@redhat.com> References: <20230725162457.156429-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.1 on 10.11.54.6 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: -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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1690302372746100007 From: Akihiko Odaki When _FORTIFY_SOURCE=3D2, glibc version is 2.35, and GCC version is 12.1.0, the compiler complains as follows: In file included from /usr/include/string.h:535, from /home/alarm/q/var/qemu/include/qemu/osdep.h:99, from ../crypto/block-luks.c:21: In function 'memset', inlined from 'qcrypto_block_luks_store_key' at ../crypto/block-luks.c:8= 43:9: /usr/include/bits/string_fortified.h:59:10: error: 'splitkeylen' may be use= d uninitialized [-Werror=3Dmaybe-uninitialized] 59 | return __builtin___memset_chk (__dest, __ch, __len, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 60 | __glibc_objsize0 (__dest)); | ~~~~~~~~~~~~~~~~~~~~~~~~~~ ../crypto/block-luks.c: In function 'qcrypto_block_luks_store_key': ../crypto/block-luks.c:699:12: note: 'splitkeylen' was declared here 699 | size_t splitkeylen; | ^~~~~~~~~~~ It seems the compiler cannot see that splitkeylen will not be used when splitkey is NULL. Suppress the warning by initializing splitkeylen even when splitkey stays NULL. Signed-off-by: Akihiko Odaki Signed-off-by: Daniel P. Berrang=C3=A9 --- crypto/block-luks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/block-luks.c b/crypto/block-luks.c index 5688783ab1..2f59c3a625 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -706,14 +706,14 @@ qcrypto_block_luks_store_key(QCryptoBlock *block, =20 assert(slot_idx < QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS); slot =3D &luks->header.key_slots[slot_idx]; + splitkeylen =3D luks->header.master_key_len * slot->stripes; + if (qcrypto_random_bytes(slot->salt, QCRYPTO_BLOCK_LUKS_SALT_LEN, errp) < 0) { goto cleanup; } =20 - splitkeylen =3D luks->header.master_key_len * slot->stripes; - /* * Determine how many iterations are required to * hash the user password while consuming 1 second of compute --=20 2.41.0 From nobody Mon May 13 21:33:21 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=1690302342; cv=none; d=zohomail.com; s=zohoarc; b=SdwtbExdgXxLGiBZ5Ex90ES8RpqkQ5srNSF63OlkQoGmNVj2DrwM1oHJAsiRRpPAlNBfKrnkEv0zZE/ZPf6tz/nitxC4xwhM92SpZWKvwzsMBLM/0fQ5hsNIE9nc+khAUrqYFDk3tPadDDx19dCmNVYJbZ56iSdrBIYmjXKFG+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1690302342; h=Content-Type: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=xHhWBlakPAYmAyyjRvvdaQeVpdt73QVTG1xnr9gXccw=; b=VsC0irYR6tRuf9dww4PmFLC4hg/qtyLlMPzUbdjo+59KOxBSpNj72nBfWYKoM+sv3IGAzJYqtDQHu4Zi+Zox+tiXLbODn7bRywNtT4vUDycbTiB8Scq7JaOgA34TS/xkbcjxeNWigQTflTooDA0LNvjwRcRbN0j94txZw0cW66A= 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 1690302342814102.26915756965218; Tue, 25 Jul 2023 09:25:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOKqg-0005Mj-4V; Tue, 25 Jul 2023 12:25:22 -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 1qOKqc-0005KX-NH for qemu-devel@nongnu.org; Tue, 25 Jul 2023 12:25:19 -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 1qOKqS-0004Cg-Uu for qemu-devel@nongnu.org; Tue, 25 Jul 2023 12:25:15 -0400 Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-145-G--NsH9sOeqXjrGradYSBg-1; Tue, 25 Jul 2023 12:25:02 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 835661C09A49; Tue, 25 Jul 2023 16:25:01 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.28.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 807922166B28; Tue, 25 Jul 2023 16:25:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690302305; 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=xHhWBlakPAYmAyyjRvvdaQeVpdt73QVTG1xnr9gXccw=; b=GzeVERzivU9oZ7o6ZsV9VFjc6YbmpUMlsNEMU01qJ7JtxOh6wyyIb6g90zARESi6UY06UW nmal3E+Pl6GQaloxLjs0qWdLgcFYy6TUARg0EpDoUPx3xefFH1Ir3uk0R3jjJXoTwwAZrO K4PIvX/tg7j9vLN9GXUp5y2ByIg61Vc= X-MC-Unique: G--NsH9sOeqXjrGradYSBg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: "Canokeys.org" , Gerd Hoffmann , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Hongren (Zenithal) Zheng" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , YuanYang Meng Subject: [PULL 2/2] hw/usb/canokey: change license to GPLv2+ Date: Tue, 25 Jul 2023 17:24:57 +0100 Message-ID: <20230725162457.156429-3-berrange@redhat.com> In-Reply-To: <20230725162457.156429-1-berrange@redhat.com> References: <20230725162457.156429-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.1 on 10.11.54.6 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: -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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1690302344529100003 From: "Hongren (Zenithal) Zheng" Apache license is considered by some to be not compatible with GPLv2+. Since QEMU as combined work is GPLv2-only, these two files should be made compatible. Reported-by: "Daniel P. Berrang=C3=A9" Link: https://lore.kernel.org/qemu-devel/ZEpKXncC%2Fe6FKRe9@redhat.com/ Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-By: canokeys.org (http://canokeys.org) Acked-by: YuanYang Meng Signed-off-by: Hongren (Zenithal) Zheng Signed-off-by: Daniel P. Berrang=C3=A9 --- hw/usb/canokey.c | 2 +- hw/usb/canokey.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb/canokey.c b/hw/usb/canokey.c index bbc5da07b5..b306eeb20e 100644 --- a/hw/usb/canokey.c +++ b/hw/usb/canokey.c @@ -4,7 +4,7 @@ * Copyright (c) 2021-2022 Canokeys.org * Written by Hongren (Zenithal) Zheng * - * This code is licensed under the Apache-2.0. + * This code is licensed under the GPL v2 or later. */ =20 #include "qemu/osdep.h" diff --git a/hw/usb/canokey.h b/hw/usb/canokey.h index 24cf304203..e528889d33 100644 --- a/hw/usb/canokey.h +++ b/hw/usb/canokey.h @@ -4,7 +4,7 @@ * Copyright (c) 2021-2022 Canokeys.org * Written by Hongren (Zenithal) Zheng * - * This code is licensed under the Apache-2.0. + * This code is licensed under the GPL v2 or later. */ =20 #ifndef CANOKEY_H --=20 2.41.0