From nobody Sun Apr 6 03:40:30 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=<kraxel@redhat.com> (p=quarantine dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
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 <qemu-devel-bounces@nongnu.org>)
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 <kraxel@redhat.com>) 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 <kraxel@redhat.com>) 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 <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Kashyap Chamarthy <kchamart@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=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 <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
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