projects
/
xen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c3185a6
)
xenoprof: free domain's vcpu array
author
Jan Beulich
<jbeulich@suse.com>
Thu, 29 Oct 2015 12:51:24 +0000
(13:51 +0100)
committer
Bastian Blank
<waldi@debian.org>
Sun, 1 Nov 2015 20:49:07 +0000
(20:49 +0000)
This was overlooked in
fb442e2171
("x86_64: allow more vCPU-s per
guest").
This is CVE-2015-7969 / XSA-151.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Ian Campbell <ian.campbell@citrix.com>
master commit:
6e97c4b37386c2d09e09e9b5d5d232e37728b960
master date: 2015-10-29 13:36:52 +0100
(cherry picked from commit
429f0cd270851462783fc6d56d6bae9cbb40bdca
)
Patch-Name: CVE-2015-7969.1.diff
Gbp-Pq: Name CVE-2015-7969.1.diff
xen/common/xenoprof.c
patch
|
blob
|
history
diff --git
a/xen/common/xenoprof.c
b/xen/common/xenoprof.c
index 1061323ea0394049683c33b72c173831feef56dd..53a803a551344029210980128a294bc81ab37fc1 100644
(file)
--- a/
xen/common/xenoprof.c
+++ b/
xen/common/xenoprof.c
@@
-239,6
+239,7
@@
static int alloc_xenoprof_struct(
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
@@
void free_xenoprof_pages(struct domain *d)
free_xenheap_pages(x->rawbuf, order);
}
+ xfree(x->vcpu);
xfree(x);
d->xenoprof = NULL;
}