summaryrefslogtreecommitdiff
path: root/sysutils/xenkernel42/patches/patch-CVE-2015-7969
blob: def4d8af666ff268bf604a941d7637a1d17d5e4a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
$NetBSD: patch-CVE-2015-7969,v 1.1.2.2 2015/11/04 20:02:32 bsiegert Exp $

Patch for CVE-2015-7869 aka XSA-149 + XSA-151 based on
http://xenbits.xenproject.org/xsa/xsa149.patch
http://xenbits.xenproject.org/xsa/xsa151.patch

--- xen/common/domain.c.orig	2014-09-02 08:22:57.000000000 +0200
+++ xen/common/domain.c	2015-10-29 22:29:21.000000000 +0100
@@ -685,6 +685,7 @@
 
     xsm_free_security_domain(d);
     free_cpumask_var(d->domain_dirty_cpumask);
+    xfree(d->vcpu);
     free_domain_struct(d);
 
     send_global_virq(VIRQ_DOM_EXC);
--- xen/common/xenoprof.c.orig	2014-09-02 08:22:57.000000000 +0200
+++ xen/common/xenoprof.c	2015-10-29 22:29:35.000000000 +0100
@@ -239,6 +239,7 @@
     d->xenoprof->rawbuf = alloc_xenheap_pages(get_order_from_pages(npages), 0);
     if ( d->xenoprof->rawbuf == NULL )
     {
+        xfree(d->xenoprof->vcpu);
         xfree(d->xenoprof);
         d->xenoprof = NULL;
         return -ENOMEM;
@@ -286,6 +287,7 @@
         free_xenheap_pages(x->rawbuf, order);
     }
 
+    xfree(x->vcpu);
     xfree(x);
     d->xenoprof = NULL;
 }