From patchwork Tue Jul 30 13:15:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Manthey X-Patchwork-Id: 11065757 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AA47C13A0 for ; Tue, 30 Jul 2019 13:17:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99E8F287C9 for ; Tue, 30 Jul 2019 13:17:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8DA08287DC; Tue, 30 Jul 2019 13:17:21 +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,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,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 AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BF573287C9 for ; Tue, 30 Jul 2019 13:17:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hsRyy-0001g9-AS; Tue, 30 Jul 2019 13:16:00 +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 1hsRyx-0001fy-5T for xen-devel@lists.xenproject.org; Tue, 30 Jul 2019 13:15:59 +0000 X-Inumbo-ID: 29f095a4-b2cc-11e9-9257-67f4f74de37c Received: from smtp-fw-33001.amazon.com (unknown [207.171.190.10]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 29f095a4-b2cc-11e9-9257-67f4f74de37c; Tue, 30 Jul 2019 13:15:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1564492556; x=1596028556; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=yxZuxym18sXpcj2SP7bh1BFXoFjWkH/yVOuGe+/4WfE=; b=jsL8msajgpKdaUTmXLNDKZP1qeTH3Ao96ikM1lgjR8sdEZir7ddrW7Kt ialtbdT6IkItidEJDU3a29bHxcUriTKDBmKWnpM87Xus8UPolFDypSzk7 r3SmOWdTiILwGYTiPycbYktD1j4vkcnMz9cW56J/Bk9p4d7XQdMiInLTh c=; X-IronPort-AV: E=Sophos;i="5.64,326,1559520000"; d="scan'208";a="814923745" Received: from sea3-co-svc-lb6-vlan3.sea.amazon.com (HELO email-inbound-relay-2b-859fe132.us-west-2.amazon.com) ([10.47.22.38]) by smtp-border-fw-out-33001.sea14.amazon.com with ESMTP; 30 Jul 2019 13:15:55 +0000 Received: from EX13MTAUEA001.ant.amazon.com (pdx4-ws-svc-p6-lb7-vlan2.pdx.amazon.com [10.170.41.162]) by email-inbound-relay-2b-859fe132.us-west-2.amazon.com (Postfix) with ESMTPS id 8BABF221CA2; Tue, 30 Jul 2019 13:15:54 +0000 (UTC) Received: from EX13D08UEE001.ant.amazon.com (10.43.62.126) by EX13MTAUEA001.ant.amazon.com (10.43.61.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Tue, 30 Jul 2019 13:15:54 +0000 Received: from EX13MTAUWC001.ant.amazon.com (10.43.162.135) by EX13D08UEE001.ant.amazon.com (10.43.62.126) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Tue, 30 Jul 2019 13:15:53 +0000 Received: from uc1a35a69ae4659.ant.amazon.com (10.109.93.13) by mail-relay.amazon.com (10.43.162.232) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Tue, 30 Jul 2019 13:15:49 +0000 From: Norbert Manthey To: Date: Tue, 30 Jul 2019 15:15:02 +0200 Message-ID: <1564492503-22716-2-git-send-email-nmanthey@amazon.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1564492503-22716-1-git-send-email-nmanthey@amazon.de> References: <1564492503-22716-1-git-send-email-nmanthey@amazon.de> MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [PATCH L1TF MDS GT v4 1/2] common/grant_table: harden bound accesses X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Tim Deegan , Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Dario Faggioli , Martin Pohlack , Pawel Wieczorkiewicz , Julien Grall , David Woodhouse , Jan Beulich , Martin Mazein , Bjoern Doebel , Norbert Manthey Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Guests can issue grant table operations and provide guest controlled data to them. This data is used as index for memory loads after bound checks have been done. To avoid speculative out-of-bound accesses, we use the array_index_nospec macro where applicable, or the macro block_speculation. Note, the block_speculation macro is used on all path in shared_entry_header and nr_grant_entries. This way, after a call to such a function, all bound checks that happened before become architectural visible, so that no additional protection is required for corresponding array accesses. As the way we introduce an lfence instruction might allow the compiler to reload certain values from memory multiple times, we try to avoid speculatively continuing execution with stale register data by moving relevant data into function local variables. Speculative execution is not blocked in case one of the following properties is true: - path cannot be triggered by the guest - path does not return to the guest - path does not result in an out-of-bound access Only the combination of the above properties allows to actually leak continuous chunks of memory. Therefore, we only add the penalty of protective mechanisms in case a potential speculative out-of-bound access matches all the above properties. This commit addresses only out-of-bound accesses whose index is directly controlled by the guest, and the index is checked before. Potential out-of-bound accesses that are caused by speculatively evaluating the version of the current table are not addressed in this commit. Hence, speculative out-of-bound accesses might still be possible, for example in gnttab_get_status_frame_mfn, when calling gnttab_grow_table, the assertion that the grant table version equals two might not hold under speculation. This is part of the speculative hardening effort. Signed-off-by: Norbert Manthey Reviewed-by: Jan Beulich --- Notes: v3: Drop condition to not fix defects in commit message. Copy in reviewed-by. xen/common/grant_table.c | 72 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 21 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -911,6 +911,7 @@ map_grant_ref( { struct domain *ld, *rd, *owner = NULL; struct grant_table *lgt, *rgt; + grant_ref_t ref; struct vcpu *led; grant_handle_t handle; mfn_t mfn; @@ -974,13 +975,15 @@ map_grant_ref( grant_read_lock(rgt); /* Bounds check on the grant ref */ - if ( unlikely(op->ref >= nr_grant_entries(rgt))) + ref = op->ref; + if ( unlikely(ref >= nr_grant_entries(rgt))) PIN_FAIL(unlock_out, GNTST_bad_gntref, "Bad ref %#x for d%d\n", - op->ref, rgt->domain->domain_id); + ref, rgt->domain->domain_id); - act = active_entry_acquire(rgt, op->ref); - shah = shared_entry_header(rgt, op->ref); - status = rgt->gt_version == 1 ? &shah->flags : &status_entry(rgt, op->ref); + /* This call also ensures the above check cannot be passed speculatively */ + shah = shared_entry_header(rgt, ref); + status = rgt->gt_version == 1 ? &shah->flags : &status_entry(rgt, ref); + act = active_entry_acquire(rgt, ref); /* If already pinned, check the active domid and avoid refcnt overflow. */ if ( act->pin && @@ -1003,8 +1006,8 @@ map_grant_ref( if ( !act->pin ) { unsigned long gfn = rgt->gt_version == 1 ? - shared_entry_v1(rgt, op->ref).frame : - shared_entry_v2(rgt, op->ref).full_page.frame; + shared_entry_v1(rgt, ref).frame : + shared_entry_v2(rgt, ref).full_page.frame; rc = get_paged_frame(gfn, &mfn, &pg, op->flags & GNTMAP_readonly, rd); @@ -1017,7 +1020,7 @@ map_grant_ref( act->length = PAGE_SIZE; act->is_sub_page = false; act->trans_domain = rd; - act->trans_gref = op->ref; + act->trans_gref = ref; } } @@ -1268,6 +1271,7 @@ unmap_common( domid_t dom; struct domain *ld, *rd; struct grant_table *lgt, *rgt; + grant_ref_t ref; struct active_grant_entry *act; s16 rc = 0; struct grant_mapping *map; @@ -1321,6 +1325,7 @@ unmap_common( op->rd = rd; op->ref = map->ref; + ref = map->ref; /* * We can't assume there was no racing unmap for this maptrack entry, @@ -1330,7 +1335,7 @@ unmap_common( * invalid lock. */ smp_rmb(); - if ( unlikely(op->ref >= nr_grant_entries(rgt)) ) + if ( unlikely(ref >= nr_grant_entries(rgt)) ) { gdprintk(XENLOG_WARNING, "Unstable d%d handle %#x\n", rgt->domain->domain_id, op->handle); @@ -1339,7 +1344,10 @@ unmap_common( goto unlock_out; } - act = active_entry_acquire(rgt, op->ref); + /* Make sure the above bound check cannot be bypassed speculatively */ + block_speculation(); + + act = active_entry_acquire(rgt, ref); /* * Note that we (ab)use the active entry lock here to protect against @@ -1352,7 +1360,7 @@ unmap_common( flags = read_atomic(&map->flags); smp_rmb(); if ( unlikely(!flags) || unlikely(map->domid != dom) || - unlikely(map->ref != op->ref) ) + unlikely(map->ref != ref) ) { gdprintk(XENLOG_WARNING, "Unstable handle %#x\n", op->handle); rc = GNTST_bad_handle; @@ -1437,7 +1445,7 @@ unmap_common_complete(struct gnttab_unmap_common *op) uint16_t *status; unsigned int clear_flags = 0; - if ( !op->done ) + if ( evaluate_nospec(!op->done) ) { /* unmap_common() didn't do anything - nothing to complete. */ return; @@ -2047,6 +2055,7 @@ gnttab_prepare_for_transfer( goto fail; } + /* This call also ensures the above check cannot be passed speculatively */ raw_shah = (uint32_t *)shared_entry_header(rgt, ref); scombo.raw = ACCESS_ONCE(*raw_shah); @@ -2243,7 +2252,12 @@ gnttab_transfer( spin_unlock(&e->page_alloc_lock); okay = gnttab_prepare_for_transfer(e, d, gop.ref); - if ( unlikely(!okay || assign_pages(e, page, 0, MEMF_no_refcount)) ) + /* + * Make sure the reference bound check in gnttab_prepare_for_transfer + * is respected and speculative execution is blocked accordingly + */ + if ( unlikely(!evaluate_nospec(okay)) || + unlikely(assign_pages(e, page, 0, MEMF_no_refcount)) ) { bool drop_dom_ref; @@ -2441,8 +2455,10 @@ acquire_grant_for_copy( PIN_FAIL(gt_unlock_out, GNTST_bad_gntref, "Bad grant reference %#x\n", gref); - act = active_entry_acquire(rgt, gref); + /* This call also ensures the above check cannot be passed speculatively */ shah = shared_entry_header(rgt, gref); + act = active_entry_acquire(rgt, gref); + if ( rgt->gt_version == 1 ) { sha2 = NULL; @@ -2861,6 +2877,9 @@ static int gnttab_copy_buf(const struct gnttab_copy *op, op->dest.offset, dest->ptr.offset, op->len, dest->len); + /* Make sure the above checks are not bypassed speculatively */ + block_speculation(); + memcpy(dest->virt + op->dest.offset, src->virt + op->source.offset, op->len); gnttab_mark_dirty(dest->domain, dest->mfn); @@ -2980,7 +2999,7 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) struct grant_table *gt = currd->grant_table; grant_entry_v1_t reserved_entries[GNTTAB_NR_RESERVED_ENTRIES]; int res; - unsigned int i; + unsigned int i, nr_ents; if ( copy_from_guest(&op, uop, 1) ) return -EFAULT; @@ -3004,7 +3023,8 @@ gnttab_set_version(XEN_GUEST_HANDLE_PARAM(gnttab_set_version_t) uop) * are allowed to be in use (xenstore/xenconsole keeps them mapped). * (You need to change the version number for e.g. kexec.) */ - for ( i = GNTTAB_NR_RESERVED_ENTRIES; i < nr_grant_entries(gt); i++ ) + nr_ents = nr_grant_entries(gt); + for ( i = GNTTAB_NR_RESERVED_ENTRIES; i < nr_ents; i++ ) { if ( read_atomic(&_active_entry(gt, i).pin) != 0 ) { @@ -3246,6 +3266,9 @@ swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) if ( unlikely(ref_b >= nr_grant_entries(d->grant_table))) PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-b %#x\n", ref_b); + /* Make sure the above checks are not bypassed speculatively */ + block_speculation(); + /* Swapping the same ref is a no-op. */ if ( ref_a == ref_b ) goto out; @@ -3720,13 +3743,14 @@ void grant_table_warn_active_grants(struct domain *d) struct grant_table *gt = d->grant_table; struct active_grant_entry *act; grant_ref_t ref; - unsigned int nr_active = 0; + unsigned int nr_active = 0, nr_ents; #define WARN_GRANT_MAX 10 grant_read_lock(gt); - for ( ref = 0; ref != nr_grant_entries(gt); ref++ ) + nr_ents = nr_grant_entries(gt); + for ( ref = 0; ref != nr_ents; ref++ ) { act = active_entry_acquire(gt, ref); if ( !act->pin ) @@ -3876,7 +3900,9 @@ static int gnttab_get_status_frame_mfn(struct domain *d, return -EINVAL; } - *mfn = _mfn(virt_to_mfn(gt->status[idx])); + /* Make sure idx is bounded wrt nr_status_frames */ + *mfn = _mfn(virt_to_mfn( + gt->status[array_index_nospec(idx, nr_status_frames(gt))])); return 0; } @@ -3905,7 +3931,9 @@ static int gnttab_get_shared_frame_mfn(struct domain *d, return -EINVAL; } - *mfn = _mfn(virt_to_mfn(gt->shared_raw[idx])); + /* Make sure idx is bounded wrt nr_status_frames */ + *mfn = _mfn(virt_to_mfn( + gt->shared_raw[array_index_nospec(idx, nr_grant_frames(gt))])); return 0; } @@ -3975,6 +4003,7 @@ static void gnttab_usage_print(struct domain *rd) int first = 1; grant_ref_t ref; struct grant_table *gt = rd->grant_table; + unsigned int nr_ents; printk(" -------- active -------- -------- shared --------\n"); printk("[ref] localdom mfn pin localdom gmfn flags\n"); @@ -3987,7 +4016,8 @@ static void gnttab_usage_print(struct domain *rd) nr_grant_frames(gt), gt->max_grant_frames, nr_maptrack_frames(gt), gt->max_maptrack_frames); - for ( ref = 0; ref != nr_grant_entries(gt); ref++ ) + nr_ents = nr_grant_entries(gt); + for ( ref = 0; ref != nr_ents; ref++ ) { struct active_grant_entry *act; struct grant_entry_header *sha; From patchwork Tue Jul 30 13:15:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Manthey X-Patchwork-Id: 11065761 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 56A06746 for ; Tue, 30 Jul 2019 13:18:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 412D32867C for ; Tue, 30 Jul 2019 13:18:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 354E7287C9; Tue, 30 Jul 2019 13:18:23 +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,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,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 AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 133B62867C for ; Tue, 30 Jul 2019 13:18:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hsRzc-0001kO-OV; Tue, 30 Jul 2019 13:16:40 +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 1hsRzb-0001kE-9R for xen-devel@lists.xenproject.org; Tue, 30 Jul 2019 13:16:39 +0000 X-Inumbo-ID: 4351f286-b2cc-11e9-93c2-4f11b262faea Received: from smtp-fw-2101.amazon.com (unknown [72.21.196.25]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 4351f286-b2cc-11e9-93c2-4f11b262faea; Tue, 30 Jul 2019 13:16:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1564492598; x=1596028598; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=+gLCTSxIdLMXM7xNax1qxB89cdEfyHbYx5DYzdVdYDo=; b=TnhVbeXEmj5uXrq8Z6hossmaATamCmTV8hR42hQvY46s68a+u4OIFngd V2xh3esrZwTdjPLW4275Cqlz2RY5llHH7X1gBkB+CapSJm+vtJmR9DeC5 K+7QJpH/NHY2s8OhFjT95RK16AQFiQRcppsS+E3dWNooTAlTXS1X09RFY c=; X-IronPort-AV: E=Sophos;i="5.64,326,1559520000"; d="scan'208";a="744318040" Received: from iad6-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-1d-38ae4ad2.us-east-1.amazon.com) ([10.124.125.2]) by smtp-border-fw-out-2101.iad2.amazon.com with ESMTP; 30 Jul 2019 13:16:37 +0000 Received: from EX13MTAUEB001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1d-38ae4ad2.us-east-1.amazon.com (Postfix) with ESMTPS id 5B813A2775; Tue, 30 Jul 2019 13:16:34 +0000 (UTC) Received: from EX13D08UEB002.ant.amazon.com (10.43.60.107) by EX13MTAUEB001.ant.amazon.com (10.43.60.129) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Tue, 30 Jul 2019 13:16:33 +0000 Received: from EX13MTAUWC001.ant.amazon.com (10.43.162.135) by EX13D08UEB002.ant.amazon.com (10.43.60.107) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Tue, 30 Jul 2019 13:16:33 +0000 Received: from uc1a35a69ae4659.ant.amazon.com (10.109.93.13) by mail-relay.amazon.com (10.43.162.232) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Tue, 30 Jul 2019 13:16:29 +0000 From: Norbert Manthey To: Date: Tue, 30 Jul 2019 15:15:03 +0200 Message-ID: <1564492503-22716-3-git-send-email-nmanthey@amazon.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1564492503-22716-1-git-send-email-nmanthey@amazon.de> References: <1564492503-22716-1-git-send-email-nmanthey@amazon.de> MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [PATCH L1TF MDS GT v4 2/2] common/grant_table: harden version dependent accesses X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Tim Deegan , Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Dario Faggioli , Martin Pohlack , Pawel Wieczorkiewicz , Julien Grall , David Woodhouse , Jan Beulich , Martin Mazein , Bjoern Doebel , Norbert Manthey Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Guests can issue grant table operations and provide guest controlled data to them. This data is used as index for memory loads after bound checks have been done. Depending on the grant table version, the size of elements in containers differ. As the base data structure is a page, the number of elements per page also differs. Consequently, bound checks are version dependent, so that speculative execution can happen in several stages, the bound check as well as the version check. This commit mitigates cases where out-of-bound accesses could happen due to the version comparison. In cases, where no different memory locations are accessed on the code path that follow an if statement, no protection is required. No different memory locations are accessed in the following functions after a version check: * gnttab_setup_table: only calculated numbersi are used, and then function gnttab_grow_table is called, which is version protected * gnttab_transfer: the case that depends on the version check just gets into copying a page or not * acquire_grant_for_copy: the not fixed comparison is on the abort path and does not access other structures, and on the else branch accesses only structures that have been validated before * gnttab_set_version: all accessible data is allocated for both versions Furthermore, the functions gnttab_populate_status_frames and gnttab_unpopulate_status_frames received a block_speculation macro. Hence, this code will only be executed once the correct version is visible in the architectural state. * gnttab_release_mappings: this function is called only during domain destruction and control is not returned to the guest * mem_sharing_gref_to_gfn: speculation will be stoped by the second if statement, as that places a barrier on any path to be executed. * gnttab_get_status_frame_mfn: no version dependent check, because all accesses, except the gt->status[idx], do not perform index-based accesses, or speculative out-of-bound accesses in the gnttab_grow_table function call. * gnttab_usage_print: cannot be triggered by the guest This is part of the speculative hardening effort. Signed-off-by: Norbert Manthey Reviewed-by: Jan Beulich --- xen/common/grant_table.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -827,7 +827,7 @@ static int _set_status(const grant_entry_header_t *shah, domid_t ldomid) { - if ( rgt_version == 1 ) + if ( evaluate_nospec(rgt_version == 1) ) return _set_status_v1(shah, rd, act, readonly, mapflag, ldomid); else return _set_status_v2(shah, status, rd, act, readonly, mapflag, ldomid); @@ -982,9 +982,12 @@ map_grant_ref( /* This call also ensures the above check cannot be passed speculatively */ shah = shared_entry_header(rgt, ref); - status = rgt->gt_version == 1 ? &shah->flags : &status_entry(rgt, ref); act = active_entry_acquire(rgt, ref); + /* Make sure we do not access memory speculatively */ + status = evaluate_nospec(rgt->gt_version == 1) ? &shah->flags + : &status_entry(rgt, ref); + /* If already pinned, check the active domid and avoid refcnt overflow. */ if ( act->pin && ((act->domid != ld->domain_id) || @@ -1005,7 +1008,7 @@ map_grant_ref( if ( !act->pin ) { - unsigned long gfn = rgt->gt_version == 1 ? + unsigned long gfn = evaluate_nospec(rgt->gt_version == 1) ? shared_entry_v1(rgt, ref).frame : shared_entry_v2(rgt, ref).full_page.frame; @@ -1461,7 +1464,7 @@ unmap_common_complete(struct gnttab_unmap_common *op) act = active_entry_acquire(rgt, op->ref); sha = shared_entry_header(rgt, op->ref); - if ( rgt->gt_version == 1 ) + if ( evaluate_nospec(rgt->gt_version == 1) ) status = &sha->flags; else status = &status_entry(rgt, op->ref); @@ -1657,6 +1660,10 @@ gnttab_populate_status_frames(struct domain *d, struct grant_table *gt, unsigned req_status_frames; req_status_frames = grant_to_status_frames(req_nr_frames); + + /* Make sure, prior version checks are architectural visible */ + block_speculation(); + for ( i = nr_status_frames(gt); i < req_status_frames; i++ ) { if ( (gt->status[i] = alloc_xenheap_page()) == NULL ) @@ -1685,6 +1692,9 @@ gnttab_unpopulate_status_frames(struct domain *d, struct grant_table *gt) { unsigned int i; + /* Make sure, prior version checks are architectural visible */ + block_speculation(); + for ( i = 0; i < nr_status_frames(gt); i++ ) { struct page_info *pg = virt_to_page(gt->status[i]); @@ -1795,7 +1805,7 @@ gnttab_grow_table(struct domain *d, unsigned int req_nr_frames) } /* Status pages - version 2 */ - if ( gt->gt_version > 1 ) + if ( evaluate_nospec(gt->gt_version > 1) ) { if ( gnttab_populate_status_frames(d, gt, req_nr_frames) ) goto shared_alloc_failed; @@ -2289,7 +2299,7 @@ gnttab_transfer( grant_read_lock(e->grant_table); act = active_entry_acquire(e->grant_table, gop.ref); - if ( e->grant_table->gt_version == 1 ) + if ( evaluate_nospec(e->grant_table->gt_version == 1) ) { grant_entry_v1_t *sha = &shared_entry_v1(e->grant_table, gop.ref); @@ -2351,7 +2361,7 @@ release_grant_for_copy( sha = shared_entry_header(rgt, gref); mfn = act->mfn; - if ( rgt->gt_version == 1 ) + if ( evaluate_nospec(rgt->gt_version == 1) ) { status = &sha->flags; td = rd; @@ -2459,7 +2469,7 @@ acquire_grant_for_copy( shah = shared_entry_header(rgt, gref); act = active_entry_acquire(rgt, gref); - if ( rgt->gt_version == 1 ) + if ( evaluate_nospec(rgt->gt_version == 1) ) { sha2 = NULL; status = &shah->flags; @@ -3281,7 +3291,7 @@ swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b) if ( act_b->pin ) PIN_FAIL(out, GNTST_eagain, "ref b %#x busy\n", ref_b); - if ( gt->gt_version == 1 ) + if ( evaluate_nospec(gt->gt_version == 1) ) { grant_entry_v1_t shared; @@ -3835,7 +3845,7 @@ int mem_sharing_gref_to_gfn(struct grant_table *gt, grant_ref_t ref, rc = -EINVAL; else if ( ref >= nr_grant_entries(gt) ) rc = -ENOENT; - else if ( gt->gt_version == 1 ) + else if ( evaluate_nospec(gt->gt_version == 1) ) { const grant_entry_v1_t *sha1 = &shared_entry_v1(gt, ref); @@ -3857,7 +3867,7 @@ int mem_sharing_gref_to_gfn(struct grant_table *gt, grant_ref_t ref, rc = -ENXIO; else if ( !rc && status ) { - if ( gt->gt_version == 1 ) + if ( evaluate_nospec(gt->gt_version == 1) ) *status = flags; else *status = status_entry(gt, ref); @@ -3877,6 +3887,9 @@ static int gnttab_get_status_frame_mfn(struct domain *d, ASSERT(gt->gt_version == 2); + /* Make sure we have version equal to 2 even under speculation */ + block_speculation(); + if ( idx >= nr_status_frames(gt) ) { unsigned long nr_status; @@ -3945,7 +3958,7 @@ int gnttab_map_frame(struct domain *d, unsigned long idx, gfn_t gfn, mfn_t *mfn) grant_write_lock(gt); - if ( gt->gt_version == 2 && (idx & XENMAPIDX_grant_table_status) ) + if ( evaluate_nospec(gt->gt_version == 2) && (idx & XENMAPIDX_grant_table_status) ) { idx &= ~XENMAPIDX_grant_table_status; status = true;