From patchwork Wed Mar 1 11:07:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9598259 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D788A604DC for ; Wed, 1 Mar 2017 11:09:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B32A027FAC for ; Wed, 1 Mar 2017 11:09:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A84B328405; Wed, 1 Mar 2017 11:09:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 23CFE284E8 for ; Wed, 1 Mar 2017 11:09:48 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cj26T-0002xP-Vd; Wed, 01 Mar 2017 11:07:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cj26S-0002xC-Ar for xen-devel@lists.xenproject.org; Wed, 01 Mar 2017 11:07:28 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 7A/97-04270-F6BA6B85; Wed, 01 Mar 2017 11:07:27 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOLMWRWlGSWpSXmKPExsXitHRDpG7e6m0 RBp9eGlt83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBnb1j9hLdjPXrH8eWYD43q2LkZODgkBf4kV x64zgthsAsoSPzt7weIiAnoSTQeeg8WZBZwkLix4wwJiCwv4Shy42QxWwyKgInH/3EugOAcHr 4CFxPtvHBAj5SV2tV1kBbGFBBQkOqYfYwKxeQUEJU7OfMICMVJC4uCLF8wTGLlnIUnNQpJawM i0ilGjOLWoLLVI19BIL6koMz2jJDcxM0fX0MBYLze1uDgxPTUnMalYLzk/dxMjMBAYgGAH46t u50OMkhxMSqK8jqu2RQjxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4P2zEignWJSanlqRlpkDDEmY tAQHj5II7xOQNG9xQWJucWY6ROoUoy7HjeMH3jAJseTl56VKifP+BSkSACnKKM2DGwGLj0uMs lLCvIxARwnxFKQW5WaWoMq/YhTnYFQS5l0KciVPZl4J3KZXQEcwAR3xQmUryBEliQgpqQZGhj ar1KO3OU7fO3l6vvjBP7N2LC30+tO9J+37ivJlD/bt4Alb/2t7Qep5NVY3qQXzw6OPP/X01X4 /9djXB+95TXalPeR8r6eYMeP94a2dB1Pyc87oSO81m/bTsUFlluFJTX6LRXLv85lfSCYLpJQY rgxLt9M+lfbWM0qqRv4hE5NZxd6Qyr1dSizFGYmGWsxFxYkAjeonvIoCAAA= X-Env-Sender: prvs=2260ff341=wei.liu2@citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1488366445!87981998!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 63756 invoked from network); 1 Mar 2017 11:07:26 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 1 Mar 2017 11:07:26 -0000 X-IronPort-AV: E=Sophos;i="5.35,225,1484006400"; d="scan'208";a="410546341" From: Wei Liu To: Xen-devel Date: Wed, 1 Mar 2017 11:07:24 +0000 Message-ID: <20170301110724.31181-1-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Cc: Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH 2/2] acpi: check if mapping is valid before reading / writing X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP If acpi_map_os_memory has failed, return early with AE_ERROR. Coverity-ID: 1401601 Coverity-ID: 1401602 Signed-off-by: Wei Liu Reviewed-by: Jan Beulich --- Cc: Jan Beulich --- xen/drivers/acpi/osl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c index 94dbf0406f..9881db19da 100644 --- a/xen/drivers/acpi/osl.c +++ b/xen/drivers/acpi/osl.c @@ -155,6 +155,9 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width) u32 dummy; void __iomem *virt_addr = acpi_os_map_memory(phys_addr, width >> 3); + if (!virt_addr) + return AE_ERROR; + if (!value) value = &dummy; @@ -182,6 +185,9 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width) { void __iomem *virt_addr = acpi_os_map_memory(phys_addr, width >> 3); + if (!virt_addr) + return AE_ERROR; + switch (width) { case 8: writeb(value, virt_addr);