From nobody Sun Apr 12 05:51:26 2026 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=1770910906; cv=none; d=zohomail.com; s=zohoarc; b=jp8O3VzeTSL0hlS2I3oWtIHBcJJEt9LYrimgx5p2FVhA+KHJ7UDwbRr9i3sg7TygdzUJOCMx74Mq6+i+XsNRV+pqjoTZg554KxMUTeE82MQHxGVVS17i+ANgaBo7FdJLbMylceNeSDAuHaG/GkF4pIThqMDcsNGFXEEnDSue86w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770910906; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QQX7KxVeKL70CtDZG1OEFvTRiThVwXd7bshA1fH0SOA=; b=Oj94/dl9JbVKLPym5Bj4Dn/DGFalc49163I/dKJ5LDTCcw9L6CLapaYA3yKlmxAy1J/xa/aQZvSqOg5AG4u5nf0Jmcfpka+98dSb2aD9qYmoWGsKgJIk3/mm9YNXXzu1VYGf9dM19GnujuTmB3a6aGb6+A2xh5sn/7G25j3jdm4= 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 177091090693257.38206590657808; Thu, 12 Feb 2026 07:41:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vqYoo-00067d-BJ; Thu, 12 Feb 2026 10:41:26 -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 1vqYom-000677-Qg for qemu-devel@nongnu.org; Thu, 12 Feb 2026 10:41:24 -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 1vqYok-00041R-U7 for qemu-devel@nongnu.org; Thu, 12 Feb 2026 10:41:24 -0500 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-66-JSNN_w01MYeMB4zjfB9ZZg-1; Thu, 12 Feb 2026 10:41:19 -0500 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BE2891955BC1 for ; Thu, 12 Feb 2026 15:41:18 +0000 (UTC) Received: from osteffen-thinkpadx1carbongen12.rmtde.csb (unknown [10.44.32.214]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 701D119560B9; Thu, 12 Feb 2026 15:41:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770910881; 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; bh=QQX7KxVeKL70CtDZG1OEFvTRiThVwXd7bshA1fH0SOA=; b=ewYJER9Pd5akzHdy8cz6B0Fs/anTPmzRD3nsjrv2p8RRrTcE46iBCCG+4I6eg9pZ4fvPXA NBtuywtENcUpjNoaaifjcczC2514d36unnbT9/9w8Z1QstQR8xKW4Ur5ktKXF5BoOLYMKw Bj0qANZKPekW2MEJHO8PVDEDBhv+aCo= X-MC-Unique: JSNN_w01MYeMB4zjfB9ZZg-1 X-Mimecast-MFC-AGG-ID: JSNN_w01MYeMB4zjfB9ZZg_1770910879 From: Oliver Steffen To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Ani Sinha , Luigi Leonardi , Stefano Garzarella , Oliver Steffen Subject: [PATCH v2] igvm: Add NULL checks for igvm_get_buffer() Date: Thu, 12 Feb 2026 16:41:14 +0100 Message-ID: <20260212154114.1119944-1-osteffen@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.133.124; envelope-from=osteffen@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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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 development 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: 1770910909297154100 Content-Type: text/plain; charset="utf-8" According to the documentation we are supposed to do a null-pointer check on the buffers returned by igvm_get_buffer() (part of the IGVM C library). Add these checks in the IGVM backend. Signed-off-by: Oliver Steffen Reviewed-by: Luigi Leonardi --- backends/igvm.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/backends/igvm.c b/backends/igvm.c index b01a19ba46..3b5edf1521 100644 --- a/backends/igvm.c +++ b/backends/igvm.c @@ -152,9 +152,17 @@ static int qigvm_handler(QIgvm *ctx, uint32_t type, Er= ror **errp) (int)header_handle); return -1; } - header_data =3D igvm_get_buffer(ctx->file, header_handle) + - sizeof(IGVM_VHS_VARIABLE_HEADER); - result =3D handlers[handler].handler(ctx, header_data, errp); + header_data =3D igvm_get_buffer(ctx->file, header_handle); + if (header_data !=3D NULL) { + header_data +=3D sizeof(IGVM_VHS_VARIABLE_HEADER); + result =3D handlers[handler].handler(ctx, header_data, errp); + } else { + error_setg(errp, + "IGVM: No buffer for handle %d: " + "(type 0x%X)", + header_handle, type); + result =3D -1; + } igvm_free_buffer(ctx->file, header_handle); return result; } @@ -316,6 +324,11 @@ static int qigvm_process_mem_region(QIgvm *ctx, unsign= ed start_index, return -1; } data =3D igvm_get_buffer(ctx->file, data_handle); + if (data =3D=3D NULL) { + error_setg(errp, "IGVM: No buffer for handle %d", data_han= dle); + igvm_free_buffer(ctx->file, data_handle); + return -1; + } memcpy(®ion[page_index * page_size], data, data_size); igvm_free_buffer(ctx->file, data_handle); } @@ -426,6 +439,11 @@ static int qigvm_directive_vp_context(QIgvm *ctx, cons= t uint8_t *header_data, } =20 data =3D (uint8_t *)igvm_get_buffer(ctx->file, data_handle); + if (data =3D=3D NULL) { + error_setg(errp, "IGVM: No buffer for handle %d", data_handle); + result =3D -1; + goto exit; + } =20 if (ctx->machine_state->cgs) { result =3D ctx->cgsc->set_guest_state( @@ -441,6 +459,7 @@ static int qigvm_directive_vp_context(QIgvm *ctx, const= uint8_t *header_data, result =3D -1; } =20 +exit: igvm_free_buffer(ctx->file, data_handle); if (result < 0) { return result; @@ -778,9 +797,15 @@ static int qigvm_supported_platform_compat_mask(QIgvm = *ctx, Error **errp) } platform =3D (IGVM_VHS_SUPPORTED_PLATFORM *)(igvm_get_buffer(ctx->file, - header_han= dle) + - sizeof( - IGVM_VHS_VARIABLE_HEAD= ER)); + header_han= dle)); + if (platform =3D=3D NULL) { + error_setg(errp, "IGVM: No buffer for handle %d", header_h= andle); + igvm_free_buffer(ctx->file, header_handle); + return -1; + } + + platform =3D (IGVM_VHS_SUPPORTED_PLATFORM *)((void *)platform + + sizeof(IGVM_VHS_VARIABLE_HEADER)= ); if ((platform->platform_type =3D=3D IGVM_PLATFORM_TYPE_SEV_ES)= && ctx->machine_state->cgs) { if (ctx->cgsc->check_support( --=20 2.53.0