From nobody Mon Apr 29 00:21:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1576788174; cv=none; d=zohomail.com; s=zohoarc; b=a3GknxtvEGwNFxFECvy+kPKq06V/X3KJgWuRIG5J9MpNCf/as2aBi+cC5M30oRdqrQ05deMLQr+F0ZSg/TsW+SEr5Wxpp43IDX1ky8mjDcXYbUckOZ/hFcCRp9jTFY9l5QVhWxZwHh7d+KNWtymDzcuFwVk4wRa9DDsHTklYNE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576788174; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=LEgGOXK/g/WJbO1Ydk5ZK38JTQIIS6QTpuXU2qq1caA=; b=XBuF124uf9YjlPU+jTdQ6dGVFiOm6r7S26/1fas/vFjyVpmr4UepFZz9hTutPqRTEideb594ZYBqH4hkrZlXlqpxTlA6jNYB73VZJpnKWcGXWxKAvhqEKSMiN+/RBQKOJ7mjvH3AVJyrUHVYXfqZzhZioeEGGE+/dlnchABeBc8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1576788174248976.1695276326872; Thu, 19 Dec 2019 12:42:54 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ii2cZ-0006d6-V3; Thu, 19 Dec 2019 20:42:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ii2cZ-0006d1-Hv for xen-devel@lists.xenproject.org; Thu, 19 Dec 2019 20:42:07 +0000 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 04aa16b5-22a0-11ea-928e-12813bfff9fa; Thu, 19 Dec 2019 20:42:06 +0000 (UTC) X-Inumbo-ID: 04aa16b5-22a0-11ea-928e-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1576788127; h=from:to:cc:subject:date:message-id:mime-version; bh=SGTTCyeokICR763JcNweDrWX/3VqAMJnBGJvS3gn2Uw=; b=fZ/sh7EXQYQ8rXnzJOF3wqZVMsKFc1oJwECAitT/uPr+EbbspCVtScar 0zEipR9UT++xuxLSBXBNfK2u+r4CPiq8YVVz14SYPCJSrPfif9rdY0aUf prcRUZT/rXYqXHtB67yErGhwVxjA3fqf4ixHKUFS6LW4voxDwwFSzAm3f I=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: ijdO8fjg1eZSHGKGBGoPwrmD8fNt5Pc1CG07O6JnWy91jDPqGtZOSZAHvDEbnM9WpwSI2Ee9y9 580RwG55Kpf6zykgho8xYY1VGVdrDoA/B1cRz3VCOvP3fXVeeTgzOjYrpe7pxWCt9ZZXWRWX+x mqi3NEW0a0CoflbxtKguLaJwhdlXi27vOS0osbNtbn20k4eMSmHmp0BYe1i6OFlq8tr1tagmzs 5XEFr6FINpxz/YmQ5s89a8UzBj7qkTNykipwI5YA6RcjftXgdMKpGgYrnoXMDtlbcnh6509Dvs /xQ= X-SBRS: 2.7 X-MesageID: 9971390 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.69,333,1571716800"; d="scan'208";a="9971390" From: Andrew Cooper To: Xen-devel Date: Thu, 19 Dec 2019 20:42:02 +0000 Message-ID: <20191219204202.27849-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The current logic only works by chance, in that XSAVE records also tend to = be a multiple of 128. Implement the missing logic for XSAVE. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- CC: Ian Jackson CC: Wei Liu --- tools/libxc/xc_sr_restore_x86_pv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore= _x86_pv.c index 1a26f2205f..116a004726 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -825,6 +825,15 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_contex= t *ctx, break; =20 case REC_TYPE_X86_PV_VCPU_XSAVE: + if ( blobsz < 128 ) + { + ERROR("%s record too short: min %zu, got %u", + rec_name, sizeof(*vhdr) + 128, rec->length); + goto out; + } + break; + + case REC_TYPE_X86_PV_VCPU_MSRS: if ( blobsz % sizeof(xen_domctl_vcpu_msr_t) !=3D 0 ) { ERROR("%s record payload size %zu expected to be a multiple of= %zu", --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel