From patchwork Wed Jun 21 10:10:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9801391 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 ED9C860234 for ; Wed, 21 Jun 2017 10:13:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD11628581 for ; Wed, 21 Jun 2017 10:13:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1BBD2858E; Wed, 21 Jun 2017 10:13:06 +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 CDCAF28581 for ; Wed, 21 Jun 2017 10:13:05 +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 1dNcb2-0004CR-9S; Wed, 21 Jun 2017 10:10:48 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNcb1-0004CK-3K for xen-devel@lists.xenproject.org; Wed, 21 Jun 2017 10:10:47 +0000 Received: from [193.109.254.147] by server-11.bemta-6.messagelabs.com id 5A/BA-03587-6264A495; Wed, 21 Jun 2017 10:10:46 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRWlGSWpSXmKPExsXS6fjDS1fVzSv S4GinsMX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmnFq2nS2gmdqFW0nepgbGN9IdjFycggJ5Em8 mziBBcTmFbCTeHW4gQnElhAwlDi98CZYnEVAVeJGbw+YzSagLtH2bDtrFyMHh4iAgcS5o0kgJ rOAvsS2dWAVwgLuEksmNjFDTLeTWP/zNFg1r4CgxN8dwiBhZqBw++s9rBMYuWchZGYhyUDYWh IPf91igbC1JZYtfM08C2yXtMTyfxwQYVeJCwtWsaMqAbEDJHavuM2ygJFjFaNGcWpRWWqRrqG xXlJRZnpGSW5iZo6uoYGZXm5qcXFiempOYlKxXnJ+7iZGYEgyAMEOxi/LAg4xSnIwKYnyXpD1 ihTiS8pPqcxILM6ILyrNSS0+xCjDwaEkwdviCpQTLEpNT61Iy8wBRgdMWoKDR0mEd5k5UJq3u CAxtzgzHSJ1ilGX49b5LV+YhFjy8vNSpcR52UBmCIAUZZTmwY2AReolRlkpYV5GoKOEeApSi3 IzS1DlXzGKczAqCfM2gUzhycwrgdv0CugIJqAjXhzxADmiJBEhJdXAaOi9bXo6J4vy9uC0VwG 9XRN6GcUq+l76r/ugK3lfKZnnwA6OktkHOppyLGW5vpwW7NDcLNZwizGW2fqt+4kjPedCF02Z ucTe8WSWTE7AJ75Kz1/+t9+H7e769PBU5NkL+rn7hCf7Gaitsk14wW1ittBwdmCg55NdxZ5xf 85+m/VU7ZhHaulCJZbijERDLeai4kQA3PysQs8CAAA= X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1498039843!107255722!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9938 invoked from network); 21 Jun 2017 10:10:45 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-12.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 21 Jun 2017 10:10:45 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Wed, 21 Jun 2017 04:10:43 -0600 Message-Id: <594A6241020000780016517B@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.2 Date: Wed, 21 Jun 2017 04:10:41 -0600 From: "Jan Beulich" To: "xen-devel" References: <594A6241020000780016517B@prv-mh.provo.novell.com> Mime-Version: 1.0 Cc: Andrew Cooper Subject: [Xen-devel] [PATCH] x86/mmuext: don't allow copying/clearing non-RAM pages 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 The two operations really aren't meant for anything else. Signed-off-by: Jan Beulich x86/mmuext: don't allow copying/clearing non-RAM pages The two operations really aren't meant for anything else. Signed-off-by: Jan Beulich --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3229,6 +3229,7 @@ long do_mmuext_op( switch ( op.cmd ) { struct page_info *page; + p2m_type_t p2mt; case MMUEXT_PIN_L1_TABLE: type = PGT_l1_page_table; @@ -3528,7 +3529,12 @@ long do_mmuext_op( } case MMUEXT_CLEAR_PAGE: - page = get_page_from_gfn(pg_owner, op.arg1.mfn, NULL, P2M_ALLOC); + page = get_page_from_gfn(pg_owner, op.arg1.mfn, &p2mt, P2M_ALLOC); + if ( unlikely(p2mt != p2m_ram_rw) && page ) + { + put_page(page); + page = NULL; + } if ( !page || !get_page_type(page, PGT_writable_page) ) { if ( page ) @@ -3551,8 +3557,13 @@ long do_mmuext_op( { struct page_info *src_page, *dst_page; - src_page = get_page_from_gfn(pg_owner, op.arg2.src_mfn, NULL, + src_page = get_page_from_gfn(pg_owner, op.arg2.src_mfn, &p2mt, P2M_ALLOC); + if ( unlikely(p2mt != p2m_ram_rw) && src_page ) + { + put_page(src_page); + src_page = NULL; + } if ( unlikely(!src_page) ) { gdprintk(XENLOG_WARNING, @@ -3562,8 +3573,13 @@ long do_mmuext_op( break; } - dst_page = get_page_from_gfn(pg_owner, op.arg1.mfn, NULL, + dst_page = get_page_from_gfn(pg_owner, op.arg1.mfn, &p2mt, P2M_ALLOC); + if ( unlikely(p2mt != p2m_ram_rw) && dst_page ) + { + put_page(dst_page); + dst_page = NULL; + } rc = (dst_page && get_page_type(dst_page, PGT_writable_page)) ? 0 : -EINVAL; if ( unlikely(rc) ) Reviewed-by: Andrew Cooper , however... --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3229,6 +3229,7 @@ long do_mmuext_op( switch ( op.cmd ) { struct page_info *page; + p2m_type_t p2mt; case MMUEXT_PIN_L1_TABLE: type = PGT_l1_page_table; @@ -3528,7 +3529,12 @@ long do_mmuext_op( } case MMUEXT_CLEAR_PAGE: - page = get_page_from_gfn(pg_owner, op.arg1.mfn, NULL, P2M_ALLOC); + page = get_page_from_gfn(pg_owner, op.arg1.mfn, &p2mt, P2M_ALLOC); + if ( unlikely(p2mt != p2m_ram_rw) && page ) + { + put_page(page); + page = NULL; + } if ( !page || !get_page_type(page, PGT_writable_page) ) { if ( page ) @@ -3551,8 +3557,13 @@ long do_mmuext_op( { struct page_info *src_page, *dst_page; - src_page = get_page_from_gfn(pg_owner, op.arg2.src_mfn, NULL, + src_page = get_page_from_gfn(pg_owner, op.arg2.src_mfn, &p2mt, P2M_ALLOC); + if ( unlikely(p2mt != p2m_ram_rw) && src_page ) + { + put_page(src_page); + src_page = NULL; + } if ( unlikely(!src_page) ) { gdprintk(XENLOG_WARNING, @@ -3562,8 +3573,13 @@ long do_mmuext_op( break; } - dst_page = get_page_from_gfn(pg_owner, op.arg1.mfn, NULL, + dst_page = get_page_from_gfn(pg_owner, op.arg1.mfn, &p2mt, P2M_ALLOC); + if ( unlikely(p2mt != p2m_ram_rw) && dst_page ) + { + put_page(dst_page); + dst_page = NULL; + } rc = (dst_page && get_page_type(dst_page, PGT_writable_page)) ? 0 : -EINVAL; if ( unlikely(rc) )