xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
	Keir Fraser <keir@xen.org>,
	Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
	Jan Beulich <JBeulich@suse.com>
Subject: [PATCH v3 1/2] amd/passthrough: Do not leak domain mappings from do_invalidate_dte()
Date: Wed, 4 Dec 2013 17:59:55 +0000	[thread overview]
Message-ID: <1386179995-2928-1-git-send-email-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <529F6B3F020000780010A312@nat28.tlf.novell.com>

Coverity ID: 1135379

As the code stands, the domain mapping will be leaked on each error path.

The mapping can be for a much shorter period of time, and all the relevent
information can be pulled out at once.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <JBeulich@suse.com>
CC: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>

---

Changes in v3:
 * Dont break the pointer arithmatic on gdte
---
 xen/drivers/passthrough/amd/iommu_guest.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/xen/drivers/passthrough/amd/iommu_guest.c b/xen/drivers/passthrough/amd/iommu_guest.c
index 952600a..c1fa0ff 100644
--- a/xen/drivers/passthrough/amd/iommu_guest.c
+++ b/xen/drivers/passthrough/amd/iommu_guest.c
@@ -430,6 +430,10 @@ static int do_invalidate_dte(struct domain *d, cmd_entry_t *cmd)
 
     gdom_id  = get_domid_from_dte(gdte);
     gcr3_gfn = get_guest_cr3_from_dte(gdte);
+    glx      = get_glx_from_dte(gdte);
+    gv       = get_gv_from_dte(gdte);
+
+    unmap_domain_page(gdte);
 
     /* Do not update host dte before gcr3 has been set */
     if ( gcr3_gfn == 0 )
@@ -449,11 +453,6 @@ static int do_invalidate_dte(struct domain *d, cmd_entry_t *cmd)
         return -ENODEV;
     }
 
-    glx = get_glx_from_dte(gdte);
-    gv = get_gv_from_dte(gdte);
-
-    unmap_domain_page(dte_base);
-
     /* Setup host device entry */
     hdom_id = host_domid(d, gdom_id);
     req_id = get_dma_requestor_id(iommu->seg, mbdf);
-- 
1.7.10.4

  reply	other threads:[~2013-12-04 17:59 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-04 15:09 [PATCH 0/2] Coverity fixes for map_domain_page() mismatches Andrew Cooper
2013-12-04 15:09 ` [PATCH 1/2] amd/passthrough: Do not leak domain mappings from do_invalidate_dte() Andrew Cooper
2013-12-04 15:22   ` Jan Beulich
2013-12-04 15:30     ` Andrew Cooper
2013-12-04 16:44     ` [PATCH v2 " Andrew Cooper
2013-12-04 16:49       ` Jan Beulich
2013-12-04 17:59         ` Andrew Cooper [this message]
2013-12-06  8:37           ` [PATCH v3 " Jan Beulich
2013-12-09 10:08           ` Jan Beulich
2013-12-09 18:33           ` Suravee Suthikulanit
2013-12-09 18:34             ` Andrew Cooper
2013-12-09 18:41             ` [PATCH v4 " Andrew Cooper
2013-12-09 20:02               ` Suravee Suthikulpanit
2013-12-04 15:09 ` [PATCH 2/2] xen/page_alloc: Defer the domain mapping in scrub_one_page() Andrew Cooper
2013-12-04 15:23   ` Jan Beulich
2013-12-09 10:09   ` Jan Beulich
2013-12-09 11:02     ` Keir Fraser

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1386179995-2928-1-git-send-email-andrew.cooper3@citrix.com \
    --to=andrew.cooper3@citrix.com \
    --cc=JBeulich@suse.com \
    --cc=keir@xen.org \
    --cc=suravee.suthikulpanit@amd.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).