From patchwork Fri Mar 21 12:36:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 14025352 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9B8F0C36000 for ; Fri, 21 Mar 2025 12:38:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvbby-0001sZ-HX; Fri, 21 Mar 2025 08:36:30 -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 1tvbbx-0001ro-42 for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:29 -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 1tvbbv-0008O9-J0 for qemu-devel@nongnu.org; Fri, 21 Mar 2025 08:36:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742560586; 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=I5png6mRhUjk0lWJHeFGNHtdk7qrk3Iy9ijmwQrlhyA=; b=Lv7K9kJwoGRjVTRpV6Glm7nEf+qJAySHEk0kshg/KfO/g6N0Ektxg/1f13bYSTCRHTnlyL og4dKsPXsciafN43ljaq7Cqrj+fNV5CCPoCakG38S1+364jHuoxrV2AoHNKxaHojZtIC0+ UDoVIR/QpTdLF8CPZreQsRWnRXDhpYs= 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-479-3ZarA2LfOlS6pJPSJTzLuQ-1; Fri, 21 Mar 2025 08:36:14 -0400 X-MC-Unique: 3ZarA2LfOlS6pJPSJTzLuQ-1 X-Mimecast-MFC-AGG-ID: 3ZarA2LfOlS6pJPSJTzLuQ_1742560573 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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A7CA4190308B; Fri, 21 Mar 2025 12:36:12 +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 A34E11955BFE; Fri, 21 Mar 2025 12:36:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 07E83180038E; Fri, 21 Mar 2025 13:36:05 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Kashyap Chamarthy , Weiwei Li , Bibo Mao , Jiaxun Yang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , Palmer Dabbelt , qemu-riscv@nongnu.org, Gerd Hoffmann , Alistair Francis , Liu Zhiwei , Song Gao , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PULL 2/6] hw/uefi: fix error handling in uefi_vars_json_save Date: Fri, 21 Mar 2025 13:36:00 +0100 Message-ID: <20250321123604.2126923-3-kraxel@redhat.com> In-Reply-To: <20250321123604.2126923-1-kraxel@redhat.com> References: <20250321123604.2126923-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Catch lseek errors. Return on errors. Use autoptr for the GString to simplify cleanup. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Gerd Hoffmann Message-ID: <20250319141159.1461621-3-kraxel@redhat.com> --- 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 **errp) void uefi_vars_json_save(uefi_vars_state *uv) { - GString *gstr; + g_autoptr(GString) gstr = NULL; int rc; if (uv->jsonfd == -1) { @@ -187,18 +187,25 @@ void uefi_vars_json_save(uefi_vars_state *uv) gstr = uefi_vars_to_json(uv); - lseek(uv->jsonfd, 0, SEEK_SET); + rc = lseek(uv->jsonfd, 0, SEEK_SET); + if (rc < 0) { + warn_report("%s: lseek error", __func__); + return; + } + rc = ftruncate(uv->jsonfd, 0); if (rc != 0) { warn_report("%s: ftruncate error", __func__); + return; } + rc = write(uv->jsonfd, gstr->str, gstr->len); if (rc != gstr->len) { warn_report("%s: write error", __func__); + return; } + fsync(uv->jsonfd); - - g_string_free(gstr, true); } void uefi_vars_json_load(uefi_vars_state *uv, Error **errp)