From nobody Thu Apr 3 11:51:29 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1742382148; cv=none; d=zohomail.com; s=zohoarc; b=JNvaAz1SP8480jL3S6ZBiCoDG6hc9m9/at1VUt4yC1Tj8OEhA8flIeE1ur9FFQ/SdFDGmt7HsbJOuKzU9reMtwFbj1dcA3CWMDFtNJNMkyRVdfDgAK8BxvgfJLODtxcPxNjoDW6dUh5098bhyRMWuNWAKtySqSyLBrwHM+z5WFg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742382148; h=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=2Af3ED/mowFZ0kteHFPKJ10OXKrPoZEzuDihqE++sc8=; b=i7yhZ7UfNTjeT3vg8vtT5QHysh9rBCKDFKuZCv9ejOvXNm9CYt+5ripnepDoAjAWZkwAM/naydq/39Cu/MMW1Kv+RdNIdcRVgG5kZJb2BMVJlcXVZrXHRPMWtpbEfsVQjq37aqeg6JnjbhrN6V0xMaUDpHlN3VHYfVCef8hI3bw= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1742382148091831.0728216394357; Wed, 19 Mar 2025 04:02:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1turBY-0003QP-Fg; Wed, 19 Mar 2025 07:02:08 -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 1turBU-0003Pm-JZ for qemu-devel@nongnu.org; Wed, 19 Mar 2025 07:02:05 -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 1turBS-0000Nd-FI for qemu-devel@nongnu.org; Wed, 19 Mar 2025 07:02:04 -0400 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-447-U_-t_hR6MjWRBPzGm3Nxbw-1; Wed, 19 Mar 2025 07:01:56 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 9AE971828A87; Wed, 19 Mar 2025 11:01:55 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.45.224.38]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A896B19560AD; Wed, 19 Mar 2025 11:01:54 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 38CAE1800391; Wed, 19 Mar 2025 12:01:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742382120; 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=2Af3ED/mowFZ0kteHFPKJ10OXKrPoZEzuDihqE++sc8=; b=RqrCe+7xwOROIhYewGbhZyAbMjeOck5KGVNjLx0khGJRbRBkVqaI8gEAqrPizpush+KrJr vYgbBeNQOTtN5HE6IKmJSA95l/OGYTqpIl6r1r2t8KQklg7H6IjIaMr6HRGlt9OmX4fo6k odrgE/UPDhHT1KYp9ovFAFbjv/fYCiE= X-MC-Unique: U_-t_hR6MjWRBPzGm3Nxbw-1 X-Mimecast-MFC-AGG-ID: U_-t_hR6MjWRBPzGm3Nxbw_1742382115 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Kashyap Chamarthy , Gerd Hoffmann , Peter Krempa Subject: [PATCH v2 1/4] hw/uefi: flush variable store to disk in post load Date: Wed, 19 Mar 2025 12:01:48 +0100 Message-ID: <20250319110152.1309969-2-kraxel@redhat.com> In-Reply-To: <20250319110152.1309969-1-kraxel@redhat.com> References: <20250319110152.1309969-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1742382149601019100 Content-Type: text/plain; charset="utf-8" Makes live migration more robust. Commit 4c0cfc72b31a ("pflash_cfi01: write flash contents to bdrv on incoming migration") elaborates in detail on the motivation. Cc: Peter Krempa Signed-off-by: Gerd Hoffmann --- hw/uefi/var-service-core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/uefi/var-service-core.c b/hw/uefi/var-service-core.c index 8ed8378ab991..4836a0cb8116 100644 --- a/hw/uefi/var-service-core.c +++ b/hw/uefi/var-service-core.c @@ -29,6 +29,7 @@ static int uefi_vars_post_load(void *opaque, int version_= id) uefi_vars_state *uv =3D opaque; =20 uefi_vars_update_storage(uv); + uefi_vars_json_save(uv); uv->buffer =3D g_malloc(uv->buf_size); return 0; } --=20 2.48.1 From nobody Thu Apr 3 11:51:29 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1742382155; cv=none; d=zohomail.com; s=zohoarc; b=a/yZ6tm97PfH0bWcXdyAEFoYybPTRE8Hic9U4TA8D42JHESDNzmVhOgVIoLh5YYlnE8uqJfmXZRibTSq8DnoVtXrw5UQv6ZqlHnFSsy/HJ3HA9qst8zJ2X21LoG2D3ap0JlMS0ZMQ83+JrxSsbVrPcuNRSqHMUltG87u7lzO6TY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742382155; h=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=RgGmdY3pdQ4iHue54QhT4T0VWrg+j55ls0Xc/B8kk68=; b=crp7s3BaXY97Fl8FZbnx5vkEopdNfD+wqQYTNFeElg7Obo6tFL4Dty72V6YkZkzPTo6XwGNkoU/1gf25TGJjaOyGL317GBGKmNNm3J5l+p0YflwFEmmtW5BNRlU+DcFHKv5oPf8nwBfU7BG+O81w4ZxoS2VyXyPz8ClX0pRXwGk= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17423821555452.9850777859905975; Wed, 19 Mar 2025 04:02:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1turBZ-0003QX-DA; Wed, 19 Mar 2025 07:02:10 -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 1turBW-0003Q6-DM for qemu-devel@nongnu.org; Wed, 19 Mar 2025 07:02:06 -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 1turBU-0000OE-QU for qemu-devel@nongnu.org; Wed, 19 Mar 2025 07:02:06 -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-591-u2HIB3KvNyymyngyB5qGtQ-1; Wed, 19 Mar 2025 07:01:59 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 28B7E1956080; Wed, 19 Mar 2025 11:01:58 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.45.224.38]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9DCD51956094; Wed, 19 Mar 2025 11:01:57 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4818218003AD; Wed, 19 Mar 2025 12:01:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742382124; 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=RgGmdY3pdQ4iHue54QhT4T0VWrg+j55ls0Xc/B8kk68=; b=RBsM98IPz/K1ZEnuwpit4eyatqQxTmHR5lGQUS/5fiMjo6opoih7AvxBJ8s1J5DwzwNqz0 AC4z+tm402UEcTPtIslWwhaOq4ICF5qdr97DZsAvFkRkQau1V5qtGqGtuxjJTS6CUx3Pj4 c//ZASVy4lqSEM0hskIzFYVH+HtPebE= X-MC-Unique: u2HIB3KvNyymyngyB5qGtQ-1 X-Mimecast-MFC-AGG-ID: u2HIB3KvNyymyngyB5qGtQ_1742382119 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Kashyap Chamarthy , Gerd Hoffmann Subject: [PATCH v2 2/4] hw/uefi: fix error handling in uefi_vars_json_save Date: Wed, 19 Mar 2025 12:01:49 +0100 Message-ID: <20250319110152.1309969-3-kraxel@redhat.com> In-Reply-To: <20250319110152.1309969-1-kraxel@redhat.com> References: <20250319110152.1309969-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1742382155931019000 Content-Type: text/plain; charset="utf-8" Catch lseek errors. Return on errors. Use autoptr for the GString to simplify cleanup. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/uefi/var-service-json.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/hw/uefi/var-service-json.c b/hw/uefi/var-service-json.c index 761082c11fc1..f1c20a6b8c1e 100644 --- a/hw/uefi/var-service-json.c +++ b/hw/uefi/var-service-json.c @@ -178,7 +178,7 @@ void uefi_vars_json_init(uefi_vars_state *uv, Error **e= rrp) =20 void uefi_vars_json_save(uefi_vars_state *uv) { - GString *gstr; + g_autoptr(GString) gstr =3D NULL; int rc; =20 if (uv->jsonfd =3D=3D -1) { @@ -187,18 +187,25 @@ void uefi_vars_json_save(uefi_vars_state *uv) =20 gstr =3D uefi_vars_to_json(uv); =20 - lseek(uv->jsonfd, 0, SEEK_SET); + rc =3D lseek(uv->jsonfd, 0, SEEK_SET); + if (rc < 0) { + warn_report("%s: lseek error", __func__); + return; + } + rc =3D ftruncate(uv->jsonfd, 0); if (rc !=3D 0) { warn_report("%s: ftruncate error", __func__); + return; } + rc =3D write(uv->jsonfd, gstr->str, gstr->len); if (rc !=3D gstr->len) { warn_report("%s: write error", __func__); + return; } + fsync(uv->jsonfd); - - g_string_free(gstr, true); } =20 void uefi_vars_json_load(uefi_vars_state *uv, Error **errp) --=20 2.48.1 From nobody Thu Apr 3 11:51:29 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1742382257; cv=none; d=zohomail.com; s=zohoarc; b=UoZyIRNgszTGfCFB9G7SbAQv/IImg52VUmgs3WN92TnRNCj1Evwmmq4NNVAojob12c67Gg3RshqHeuAAdT0W1vDSoKBZKWFJzcZvI7rma/5vuW+bYS30XqGlKBLC8wtqMKT3U2G9d6/ixqrn/nIfjQI5vxgRhqkxGELc4aVtrnM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742382257; h=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=Ev6YGR91ZH/SVrlmEuiI/kJRS6nZPHCi+2PkteKZ0Wo=; b=WJwA9odRv94AkiH/SzVVOfpxcuFTRosjBPQjxmcWS4roYXGwFpM9otpjMzDPmp4mUPE2p36TkGvwaUSnQoOgiKrR3jUSag421ZeWKYdnd+2hRRH1ZjqIKaQm+Fru0vut0k68lS99vkuE/hxZ+1FbXCOr5Z5oS3EHEYJIEY0VdAQ= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174238225752220.358732189264515; Wed, 19 Mar 2025 04:04:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1turC6-0003cH-2U; Wed, 19 Mar 2025 07:02: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 1turBa-0003R2-1s for qemu-devel@nongnu.org; Wed, 19 Mar 2025 07:02:10 -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 1turBU-0000OD-PA for qemu-devel@nongnu.org; Wed, 19 Mar 2025 07:02:09 -0400 Received: from mx-prod-mc-04.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-280-4jx94hwuMRSGwGaz0vO-EA-1; Wed, 19 Mar 2025 07:02:00 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 88CB719560AB; Wed, 19 Mar 2025 11:01:59 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.45.224.38]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0844718001F6; Wed, 19 Mar 2025 11:01:58 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 5699F18003AE; Wed, 19 Mar 2025 12:01:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742382124; 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=Ev6YGR91ZH/SVrlmEuiI/kJRS6nZPHCi+2PkteKZ0Wo=; b=dHFa2LYYoe854goFOEvJLczMK5z7qQ4XGSdiJfu+12u3JQhMVrVDnx2AUApAKy+tQBdq8P 5ff/XgKaZoHifRmPw6yZfoXRbjlQ6yCdDjx4kCXyRBmafOjbMXKlEVRscylSrAf5oK8BgO cuapuB6fc90YTRi273xpRhS5d4aROmE= X-MC-Unique: 4jx94hwuMRSGwGaz0vO-EA-1 X-Mimecast-MFC-AGG-ID: 4jx94hwuMRSGwGaz0vO-EA_1742382119 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Kashyap Chamarthy , Gerd Hoffmann Subject: [PATCH v2 3/4] hw/uefi: fix error handling in uefi_vars_json_load Date: Wed, 19 Mar 2025 12:01:50 +0100 Message-ID: <20250319110152.1309969-4-kraxel@redhat.com> In-Reply-To: <20250319110152.1309969-1-kraxel@redhat.com> References: <20250319110152.1309969-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1742382258638019000 Content-Type: text/plain; charset="utf-8" Catch lseek errors. Return on read errors. Fixes: CID 1593154 Fixes: CID 1593157 Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/uefi/var-service-json.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/uefi/var-service-json.c b/hw/uefi/var-service-json.c index f1c20a6b8c1e..ad3462cd1557 100644 --- a/hw/uefi/var-service-json.c +++ b/hw/uefi/var-service-json.c @@ -214,7 +214,7 @@ void uefi_vars_json_load(uefi_vars_state *uv, Error **e= rrp) QObject *qobj; Visitor *v; char *str; - size_t len; + ssize_t len; int rc; =20 if (uv->jsonfd =3D=3D -1) { @@ -222,7 +222,12 @@ void uefi_vars_json_load(uefi_vars_state *uv, Error **= errp) } =20 len =3D lseek(uv->jsonfd, 0, SEEK_END); + if (len < 0) { + warn_report("%s: lseek error", __func__); + return; + } if (len =3D=3D 0) { + /* empty file */ return; } =20 @@ -231,6 +236,8 @@ void uefi_vars_json_load(uefi_vars_state *uv, Error **e= rrp) rc =3D read(uv->jsonfd, str, len); if (rc !=3D len) { warn_report("%s: read error", __func__); + g_free(str); + return; } str[len] =3D 0; =20 --=20 2.48.1 From nobody Thu Apr 3 11:51:29 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1742382214; cv=none; d=zohomail.com; s=zohoarc; b=BfNpYl25ozAJlbcfbF7bOGugthiGLVm7Gi+0KXigXAruAPZf1+75a8TjhsSzRa7fn1xEKxGfaEbbePzvDAig5gpeyEjjhEmUkSKixd3lmhaF/R0dG57JFqQE6hT13OkKXjbUkXnwusDSX+ggzN2VRawjxaDD5qDxh9akB8YnWlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742382214; h=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=ar6YzFwzYBU6H56xL2V534UAVtfDEBEaIPLQ3IY/idI=; b=N8Vn/XuOBJX7XbVcR/GZR6qiKpH6ebBL+8umIMvkNJs5kM5q09U6LcVeHlt9nNTbjDws+S32rM+xiPrJecVWF265fNR+c+tJ6hJOGzHwZdveo7eitpmZ16VvRsJYsODbVunDZ7Mec2TSE9lvMGrK40175qKLjunh6pU38ZgD6WY= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1742382214088934.6671758918636; Wed, 19 Mar 2025 04:03:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1turC4-0003UY-Kn; Wed, 19 Mar 2025 07:02:40 -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 1turBa-0003R1-1u for qemu-devel@nongnu.org; Wed, 19 Mar 2025 07:02:10 -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 1turBW-0000Od-VA for qemu-devel@nongnu.org; Wed, 19 Mar 2025 07:02:09 -0400 Received: from mx-prod-mc-03.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-203-ngDA89-SMEi-eoItX6utRA-1; Wed, 19 Mar 2025 07:02:01 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D53851956053; Wed, 19 Mar 2025 11:02:00 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.45.224.38]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8EBD61828A87; Wed, 19 Mar 2025 11:02:00 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 65DD018003B4; Wed, 19 Mar 2025 12:01:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742382126; 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=ar6YzFwzYBU6H56xL2V534UAVtfDEBEaIPLQ3IY/idI=; b=HIdnFpaiJuiHnKehXo0xLNNxTmUKatNnZPNomyxulVFu4So+eaxA8p62/dAFM3dtLxJ+kV KXlTXnbQiJO65+sMOGA7tUqleTtKcpsyxt4qapR0u49kPKWxHahsZhDIDQEjCZ6EACUVIB wObpqC74K/G3/dZJ/xViHcAcslYlvsc= X-MC-Unique: ngDA89-SMEi-eoItX6utRA-1 X-Mimecast-MFC-AGG-ID: ngDA89-SMEi-eoItX6utRA_1742382120 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Kashyap Chamarthy , Gerd Hoffmann Subject: [PATCH v2 4/4] docs/firmware: add feature flag for qemu variable store Date: Wed, 19 Mar 2025 12:01:51 +0100 Message-ID: <20250319110152.1309969-5-kraxel@redhat.com> In-Reply-To: <20250319110152.1309969-1-kraxel@redhat.com> References: <20250319110152.1309969-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1742382215386019100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann --- docs/interop/firmware.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index 57f55f6c5455..76df1043dae9 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -214,13 +214,16 @@ # PL011 UART. @verbose-static is mutually exclusive # with @verbose-dynamic. # +# @qemu-vars: The firmware expects qemu to provide an efi variable +# store, via "uefi-vars-sysbus" or "uefi-vars-x64" device. +# # Since: 3.0 ## { 'enum' : 'FirmwareFeature', 'data' : [ 'acpi-s3', 'acpi-s4', 'amd-sev', 'amd-sev-es', 'amd-sev-snp', 'intel-tdx', - 'enrolled-keys', 'requires-smm', 'secure-boot', + 'enrolled-keys', 'requires-smm', 'secure-boot', 'qemu-vars', 'verbose-dynamic', 'verbose-static' ] } =20 ## --=20 2.48.1