From 10ef7a91b5a8cb8c58903c60e2dd16ed490b3bcf Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Tue, 14 Aug 2007 09:56:46 +0100 Subject: xen: Do not accept DOMID_SELF as input to DOMCTL_getdomaininfo. This was screwing up callers that loop on getdomaininfo(), if there was a domain with domid DOMID_FIRST_RESERVED-1 (== DOMID_SELF-1). They would see DOMID_SELF-1, then look up DOMID_SELF, which has domid 0 of course, and then start their domain-finding loop all over again! Found by Kouya Shimura . Thanks! Signed-off-by: Keir Fraser --- xen/common/domctl.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 09a1e84d98..5d29667b7c 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -463,19 +463,13 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) case XEN_DOMCTL_getdomaininfo: { struct domain *d; - domid_t dom; - - dom = op->domain; - if ( dom == DOMID_SELF ) - dom = current->domain->domain_id; + domid_t dom = op->domain; rcu_read_lock(&domlist_read_lock); for_each_domain ( d ) - { if ( d->domain_id >= dom ) break; - } if ( d == NULL ) { -- cgit v1.2.3