From patchwork Fri Sep 13 14:50:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 11144873 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6C8CA1599 for ; Fri, 13 Sep 2019 14:53:35 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3E0D020830 for ; Fri, 13 Sep 2019 14:53:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="Qd8ecEvH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E0D020830 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i8mvP-0005lP-TS; Fri, 13 Sep 2019 14:51:51 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i8mvO-0005ki-F8 for xen-devel@lists.xenproject.org; Fri, 13 Sep 2019 14:51:50 +0000 X-Inumbo-ID: ec2efe8a-d635-11e9-978d-bc764e2007e4 Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ec2efe8a-d635-11e9-978d-bc764e2007e4; Fri, 13 Sep 2019 14:51:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1568386270; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tOSh+NJLlZFM+kXJseLdwaIWhBFcG6mp1z5k4/rrlEY=; b=Qd8ecEvHtVmoRkm3LOlbU1mBFMQgZo0RIOnF1aPhLoCn4b86LMqraWK+ MpEVC8jz8dBfE+mHuch1ui3yZwYmkvzyRSn3bTqw0shRu8/hheYE/8Wnd xstJRRq/+6+3RmvJutNiZogzEEBH59hbQipvBx5QUOdges4VYaYr6bOEH s=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=Pass smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa1.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@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 ~all" Received-SPF: None (esa1.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=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: RuylfgGcqVmDM0HWqFvVTb6r7R49PW+toIafriwtLXe/fADmm1O5dAJePdatTR4U9SIm9LbcdE gqnRK1AopqtGDj6RCQpSsnIqGHjBH008UJeVm7kI5zw4zUOEo1qIw4Zf8x/Mpkj8zxxhKUTaCD BvzooSE052ejgBpepcaq4NAAJS/q9SQAk9yKL46BKmj3k0uhpb7PUKoC3IJd+ETHqy4h08phGI a3PGLOti5/nHeloggWVuWJ3UmjRnDxSf88winG10eO4LAhqdqKj6ufjwZfCjoJnBQflQ0qstyv P1s= X-SBRS: 2.7 X-MesageID: 5595152 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,501,1559534400"; d="scan'208";a="5595152" From: Anthony PERARD To: Date: Fri, 13 Sep 2019 15:50:57 +0100 Message-ID: <20190913145100.303433-9-anthony.perard@citrix.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190913145100.303433-1-anthony.perard@citrix.com> References: <20190913145100.303433-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 08/11] OvmfPkg/XenBus: Change XENBUS_PROTOCOL to not return allocated memory 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: Ard Biesheuvel , Jordan Justen , Julien Grall , Anthony Perard , xen-devel@lists.xenproject.org, Laszlo Ersek Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" XsRead and XsBackendRead of the XENBUS_PROTOCOL return allocated memory but this isn't allowed during the ExitBootServices call. We need XsRead and XsBackendRead to disconnect from the device so XENBUS_PROTOCOL is changed to use a buffer supplied by a child driver. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2190 Signed-off-by: Anthony PERARD Acked-by: Laszlo Ersek --- OvmfPkg/Include/Protocol/XenBus.h | 32 ++++++++++++---------- OvmfPkg/XenBusDxe/XenStore.c | 44 +++++------------------------- OvmfPkg/XenBusDxe/XenStore.h | 6 +++-- OvmfPkg/XenPvBlkDxe/BlockFront.c | 45 ++++++++++++++++++------------- 4 files changed, 54 insertions(+), 73 deletions(-) diff --git a/OvmfPkg/Include/Protocol/XenBus.h b/OvmfPkg/Include/Protocol/XenBus.h index 8ff5ca3575..c22bdfb368 100644 --- a/OvmfPkg/Include/Protocol/XenBus.h +++ b/OvmfPkg/Include/Protocol/XenBus.h @@ -35,6 +35,12 @@ typedef struct #define XST_NIL ((XENSTORE_TRANSACTION *) NULL) +// +// When reading a node from xenstore, if the size of the data to be read is +// unknown, this value can be use for the size of the buffer. +// +#define XENSTORE_PAYLOAD_MAX 4096 + typedef enum { XENSTORE_STATUS_SUCCESS = 0, XENSTORE_STATUS_FAIL, @@ -64,19 +70,17 @@ typedef enum { /// /** - Get the contents of the node Node of the PV device. Returns the contents in - *Result which should be freed after use. + Get the contents of the node Node of the PV device. @param This A pointer to XENBUS_PROTOCOL instance. @param Transaction The XenStore transaction covering this request. @param Node The basename of the file to read. - @param Result The returned contents from this file. + @param BufferSize On input, a pointer to the size of the buffer at Buffer. + On output, the size of the data written to Buffer. + @param Buffer A pointer to a buffer into which the data read will be saved. @return On success, XENSTORE_STATUS_SUCCESS. Otherwise an errno value indicating the type of failure. - - @note The results buffer is malloced and should be free'd by the - caller. **/ typedef XENSTORE_STATUS @@ -84,23 +88,22 @@ XENSTORE_STATUS IN XENBUS_PROTOCOL *This, IN CONST XENSTORE_TRANSACTION *Transaction, IN CONST CHAR8 *Node, - OUT VOID **Result + IN OUT UINTN *BufferSize, + OUT VOID *Buffer ); /** - Get the contents of the node Node of the PV device's backend. Returns the - contents in *Result which should be freed after use. + Get the contents of the node Node of the PV device's backend. @param This A pointer to XENBUS_PROTOCOL instance. @param Transaction The XenStore transaction covering this request. @param Node The basename of the file to read. - @param Result The returned contents from this file. + @param BufferSize On input, a pointer to the size of the buffer at Buffer. + On output, the size of the data written to Buffer. + @param Buffer A pointer to a buffer into which the data read will be saved. @return On success, XENSTORE_STATUS_SUCCESS. Otherwise an errno value indicating the type of failure. - - @note The results buffer is malloced and should be free'd by the - caller. **/ typedef XENSTORE_STATUS @@ -108,7 +111,8 @@ XENSTORE_STATUS IN XENBUS_PROTOCOL *This, IN CONST XENSTORE_TRANSACTION *Transaction, IN CONST CHAR8 *Node, - OUT VOID **Result + IN OUT UINTN *BufferSize, + OUT VOID *Buffer ); /** diff --git a/OvmfPkg/XenBusDxe/XenStore.c b/OvmfPkg/XenBusDxe/XenStore.c index b9588bb8c6..cb2d9e1215 100644 --- a/OvmfPkg/XenBusDxe/XenStore.c +++ b/OvmfPkg/XenBusDxe/XenStore.c @@ -1336,27 +1336,11 @@ XenBusXenStoreRead ( IN XENBUS_PROTOCOL *This, IN CONST XENSTORE_TRANSACTION *Transaction, IN CONST CHAR8 *Node, - OUT VOID **Value + IN OUT UINTN *BufferSize, + OUT VOID *Buffer ) { - XENSTORE_STATUS Status; - UINTN BufferSize; - VOID *Buffer; - - BufferSize = XENSTORE_PAYLOAD_MAX + 1; - Buffer = AllocatePool (BufferSize); - if (Buffer == NULL) { - return XENSTORE_STATUS_ENOMEM; - } - - Status = XenStoreRead (Transaction, This->Node, Node, &BufferSize, Buffer); - - if (Status == XENSTORE_STATUS_SUCCESS) { - *Value = Buffer; - } else { - FreePool (Buffer); - } - return Status; + return XenStoreRead (Transaction, This->Node, Node, BufferSize, Buffer); } XENSTORE_STATUS @@ -1365,27 +1349,11 @@ XenBusXenStoreBackendRead ( IN XENBUS_PROTOCOL *This, IN CONST XENSTORE_TRANSACTION *Transaction, IN CONST CHAR8 *Node, - OUT VOID **Value + IN OUT UINTN *BufferSize, + OUT VOID *Buffer ) { - XENSTORE_STATUS Status; - UINTN BufferSize; - VOID *Buffer; - - BufferSize = XENSTORE_PAYLOAD_MAX + 1; - Buffer = AllocatePool (BufferSize); - if (Buffer == NULL) { - return XENSTORE_STATUS_ENOMEM; - } - - Status = XenStoreRead (Transaction, This->Backend, Node, &BufferSize, Buffer); - - if (Status == XENSTORE_STATUS_SUCCESS) { - *Value = Buffer; - } else { - FreePool (Buffer); - } - return Status; + return XenStoreRead (Transaction, This->Backend, Node, BufferSize, Buffer); } XENSTORE_STATUS diff --git a/OvmfPkg/XenBusDxe/XenStore.h b/OvmfPkg/XenBusDxe/XenStore.h index 13f7d132e6..ca8c080433 100644 --- a/OvmfPkg/XenBusDxe/XenStore.h +++ b/OvmfPkg/XenBusDxe/XenStore.h @@ -289,7 +289,8 @@ XenBusXenStoreRead ( IN XENBUS_PROTOCOL *This, IN CONST XENSTORE_TRANSACTION *Transaction, IN CONST CHAR8 *Node, - OUT VOID **Value + IN OUT UINTN *BufferSize, + OUT VOID *Buffer ); XENSTORE_STATUS @@ -298,7 +299,8 @@ XenBusXenStoreBackendRead ( IN XENBUS_PROTOCOL *This, IN CONST XENSTORE_TRANSACTION *Transaction, IN CONST CHAR8 *Node, - OUT VOID **Value + IN OUT UINTN *BufferSize, + OUT VOID *Buffer ); XENSTORE_STATUS diff --git a/OvmfPkg/XenPvBlkDxe/BlockFront.c b/OvmfPkg/XenPvBlkDxe/BlockFront.c index 8dca4c82f0..25a398ccc4 100644 --- a/OvmfPkg/XenPvBlkDxe/BlockFront.c +++ b/OvmfPkg/XenPvBlkDxe/BlockFront.c @@ -41,19 +41,22 @@ XenBusReadUint64 ( ) { XENSTORE_STATUS Status; - CHAR8 *Ptr; + CHAR8 Buffer[22]; + UINTN BufferSize; + + BufferSize = sizeof (Buffer) - 1; if (!FromBackend) { - Status = This->XsRead (This, XST_NIL, Node, (VOID**)&Ptr); + Status = This->XsRead (This, XST_NIL, Node, &BufferSize, Buffer); } else { - Status = This->XsBackendRead (This, XST_NIL, Node, (VOID**)&Ptr); + Status = This->XsBackendRead (This, XST_NIL, Node, &BufferSize, Buffer); } if (Status != XENSTORE_STATUS_SUCCESS) { return Status; } + Buffer[BufferSize] = '\0'; // AsciiStrDecimalToUint64 will ASSERT if Ptr overflow UINT64. - *ValuePtr = AsciiStrDecimalToUint64 (Ptr); - FreePool (Ptr); + *ValuePtr = AsciiStrDecimalToUint64 (Buffer); return Status; } @@ -143,43 +146,47 @@ XenPvBlockFrontInitialization ( OUT XEN_BLOCK_FRONT_DEVICE **DevPtr ) { - XENSTORE_TRANSACTION Transaction; - CHAR8 *DeviceType; - blkif_sring_t *SharedRing; - XENSTORE_STATUS Status; + XENSTORE_TRANSACTION Transaction; + CHAR8 Buffer[XENSTORE_PAYLOAD_MAX + 1]; + UINTN BufferSize; + blkif_sring_t *SharedRing; + XENSTORE_STATUS Status; XEN_BLOCK_FRONT_DEVICE *Dev; - XenbusState State; - UINT64 Value; - CHAR8 *Params; + XenbusState State; + UINT64 Value; ASSERT (NodeName != NULL); + BufferSize = sizeof (Buffer) - 1; + Dev = AllocateZeroPool (sizeof (XEN_BLOCK_FRONT_DEVICE)); Dev->Signature = XEN_BLOCK_FRONT_SIGNATURE; Dev->NodeName = NodeName; Dev->XenBusIo = XenBusIo; Dev->DeviceId = XenBusIo->DeviceId; - XenBusIo->XsRead (XenBusIo, XST_NIL, "device-type", (VOID**)&DeviceType); - if (AsciiStrCmp (DeviceType, "cdrom") == 0) { + BufferSize = sizeof (Buffer) - 1; + XenBusIo->XsRead (XenBusIo, XST_NIL, "device-type", &BufferSize, Buffer); + Buffer[BufferSize] = '\0'; + if (AsciiStrCmp (Buffer, "cdrom") == 0) { Dev->MediaInfo.CdRom = TRUE; } else { Dev->MediaInfo.CdRom = FALSE; } - FreePool (DeviceType); if (Dev->MediaInfo.CdRom) { - Status = XenBusIo->XsBackendRead (XenBusIo, XST_NIL, "params", (VOID**)&Params); + BufferSize = sizeof (Buffer) - 1; + Status = XenBusIo->XsBackendRead (XenBusIo, XST_NIL, "params", + &BufferSize, Buffer); if (Status != XENSTORE_STATUS_SUCCESS) { DEBUG ((EFI_D_ERROR, "%a: Failed to read params (%d)\n", __FUNCTION__, Status)); goto Error; } - if (AsciiStrLen (Params) == 0 || AsciiStrCmp (Params, "aio:") == 0) { - FreePool (Params); + Buffer[BufferSize] = '\0'; + if (AsciiStrLen (Buffer) == 0 || AsciiStrCmp (Buffer, "aio:") == 0) { DEBUG ((EFI_D_INFO, "%a: Empty cdrom\n", __FUNCTION__)); goto Error; } - FreePool (Params); } Status = XenBusReadUint64 (XenBusIo, "backend-id", FALSE, &Value);