From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D919EB8FA5 for ; Wed, 6 Sep 2023 07:39:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C5497440156; Wed, 6 Sep 2023 03:39:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BDA798E0014; Wed, 6 Sep 2023 03:39:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5557440156; Wed, 6 Sep 2023 03:39:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8CB8F8E0014 for ; Wed, 6 Sep 2023 03:39:36 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 65F9CC0CF1 for ; Wed, 6 Sep 2023 07:39:36 +0000 (UTC) X-FDA: 81205372752.09.D0D7B14 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by imf05.hostedemail.com (Postfix) with ESMTP id 50F35100017 for ; Wed, 6 Sep 2023 07:39:34 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=PnKs9o5q; spf=pass (imf05.hostedemail.com: domain of adrian.hunter@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=adrian.hunter@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693985974; a=rsa-sha256; cv=none; b=z2rjyrjcjpnrppWDNyCnuTUKDU0P7epV/HMH5wfn1dladoz8xr787mvEvOpMBosdoKo17L qO2b/D8I80hNHFeptDASZbukWhFwZiE5nQKZJ+Jw1zpXSlcxvwYXy+FgRKNMe2GGeov/JJ Fk7Exz3mdMVkMc2Fk0jFW6DXmNR/DCc= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=PnKs9o5q; spf=pass (imf05.hostedemail.com: domain of adrian.hunter@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=adrian.hunter@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1693985974; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=W2sdziTaMW/WMMVGc2fNA4MneXvkUwt6AXE3fxsh7g4=; b=DjXGroWcpp+mzwjjCcdDgcbBphXJ+scZmP9tBfcX+Moc8PLykHgciW7kgNZQ8KvyNE0ujM PP6rgs08552vJZ2J90jqSW9ksJGyUDJFZ+ZmZBrQRmsFVCSygxhgmL+7rvVjNSXyIIjwNw zmqoCrh/3oYT1py7YjbcMJYaZnHkfCE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693985974; x=1725521974; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fgNzEeiwp6pBaULO4mpRILdHhEu7rh3ebMJew1dYykw=; b=PnKs9o5qIPXRpbt5VN3AXHE+wHvUR7zFx4VtAIvhTT9jZs1aavCfd8WL 35gyUSGaoBIvNCEd01Gbj9xVN34jxhaSCP7z9YXx8FpNZfHy8oD3IsWXP 4jlY/UkFLbRyRW3ytp6rIdwaKwJPmblXUX1QdwkCl+3yg4s5K0XPnJ38l hl8vliZIBSLpm6A66Es9qRnl8k+jGBc6HVcMIMPCBlvoFW+S9qC88B9f3 qRICwlVwI7Fg6LTNhtlbiKP6gnQQia0yTk3Jb2crx46xf+S7xabRCIvtL Ru9yd9fmeTQBuM6PN44fdGhMcLviNuF63jgnnyGtmd6XW6XpS9j/k8/k6 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="375898484" X-IronPort-AV: E=Sophos;i="6.02,231,1688454000"; d="scan'208";a="375898484" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2023 00:39:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="988133806" X-IronPort-AV: E=Sophos;i="6.02,231,1688454000"; d="scan'208";a="988133806" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.60.154]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2023 00:39:29 -0700 From: Adrian Hunter To: "Kirill A. Shutemov" , Borislav Petkov , Andrew Morton Cc: Dave Hansen , Vlastimil Babka , Mike Rapoport , Lorenzo Stoakes , Tom Lendacky , Baoquan He , Vivek Goyal , Dave Young , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-coco@lists.linux.dev, linux-efi@vger.kernel.org, kexec@lists.infradead.org Subject: [PATCH 3/3] /dev/mem: Do not map unaccepted memory Date: Wed, 6 Sep 2023 10:39:02 +0300 Message-Id: <20230906073902.4229-4-adrian.hunter@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230906073902.4229-1-adrian.hunter@intel.com> References: <20230906073902.4229-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 50F35100017 X-Stat-Signature: rjfgg1zi7nniko63pyk8rtxegftcwpc5 X-Rspam-User: X-HE-Tag: 1693985974-329805 X-HE-Meta: U2FsdGVkX19Vt8S8Z30gNgP6MacwQ0myJtMcQQFMr6x7Cp7c1r8ri2EvZvG1PZtFpX9Jhl++XsWE2nw3T03GDgh7dRJIsNdMP4rr3Okrgb3migVZ4ocrNk7SsqghasyCtzfXd8qzI8sJKwaVvAFuPLp1S1HXbMmGHXjXQqe/W6ny6bf0Q/pGFj7XuZOo/uzKBdbeDiXnSd0+Uz579+oOrCk1BH+3kM+IMCMrX1Q+bUBn0ejRDKVcxngS4fmNstw6YVlQsXUhpqDyZ/jSIhBf9XeFOTT/lN4zAbhUeFXhmBi0cT7/iQR3IoPXFzj5Cc5ElMW4fWWNiGtMVYTthaBNQOAHI+c2muiKgLnBo5nZLAWbUbsrB9R0oTY6lE7pnS9HB+/OycvqYmRTJbRV9aezBI/WGK0EJz4IEwwh9Nj+RXskW1LjZERPUSibOyaVb6xkrSjioEHg3D2I4rtydQdWy9Tlb4Qtm+qMMDwW2S7j92L3JknxkYx7p/v9XeNsOJeN2RIGhbAoMWTBnx6FBLiTSj4WnVJG8ic5r8xT/gtmLL5gIlXBcEiHDC7TxuT/959484u93Sbu+1U6UEwBGHzW598KTuhEXMscMDUb5/ZYUgo4qtxMcSG48xi/g5Ln78uaQSxA4b01My7hFv5KVBn+clNf+GIDDci6F+rIQClqfd8Yqo7emhv0TtYL5xva0ZZ066k8VBcgYcSyvDDcFcfZ5AA+/+ZByL9d+XaRfBt+rLg7NDKb8xDIsr0EUmgOiXinNfZ86guDzum/iT3nCE7PcAcjv5cOs5q19uIQB97unB7pbcUnGv0SGVquiaND4P5j70/m3duNeSc+Az7RyY0pGO/N1DLOCaFeoPeqMDkj7FsFlJLsTxnubtkvGZOAHJy36MIrrbZIp+SjzBUzH/5hzSzYpycrvRzziscvneQ1I2vtQabOqt2OrkMtlNT9y4A4hRc0MNfbz4FDa8M/uvo a3rJrZ3c pkxpulSy+Dro/bNJvoh66UBNmW7d84BizjYGFZtk31Vqis3R8kUtgfDz2c9jQhhAqlYllXFQAHufUX4oUyD+IgWxfA3bIX0y9mtbt36Noooo6aGhaL//egd3Bz4d62Ee0nwFkXsWWeAWvsQUclKXZqP9KQiZQpoARG6KOfKnrKY4m5u0kF/86RnicD2G0WOULhqsT X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Support for unaccepted memory was added recently, refer commit dcdfdd40fa82 ("mm: Add support for unaccepted memory"), whereby a virtual machine may need to accept memory before it can be used. Do not map unaccepted memory because it can cause the guest to fail. For /dev/mem, this means a read of unaccepted memory will return zeros, a write to unaccepted memory will be ignored, but an mmap of unaccepted memory will return an error. Fixes: dcdfdd40fa82 ("mm: Add support for unaccepted memory") Signed-off-by: Adrian Hunter --- drivers/char/mem.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 1052b0f2d4cf..1a7c5728783c 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -147,7 +147,8 @@ static ssize_t read_mem(struct file *file, char __user *buf, goto failed; err = -EFAULT; - if (allowed == 2) { + if (allowed == 2 || + range_contains_unaccepted_memory(p, p + sz)) { /* Show zeros for restricted memory. */ remaining = clear_user(buf, sz); } else { @@ -226,7 +227,8 @@ static ssize_t write_mem(struct file *file, const char __user *buf, return -EPERM; /* Skip actual writing when a page is marked as restricted. */ - if (allowed == 1) { + if (allowed == 1 && + !range_contains_unaccepted_memory(p, p + sz)) { /* * On ia64 if a page has been mapped somewhere as * uncached, then it must also be accessed uncached @@ -378,6 +380,9 @@ static int mmap_mem(struct file *file, struct vm_area_struct *vma) &vma->vm_page_prot)) return -EINVAL; + if (range_contains_unaccepted_memory(offset, offset + size)) + return -EINVAL; + vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff, size, vma->vm_page_prot); -- 2.34.1