Merge pull request #414 from msdx321/loader

gparmer · web-flow · commit f9ed59fa14ef · 2021-03-17T11:24:33.000-04:00
capmgr: Fix two bugs in capmgr

Looks great!
diff --git a/src/components/implementation/capmgr/simple/capmgr.c b/src/components/implementation/capmgr/simple/capmgr.c
@@ -176,7 +176,7 @@ mm_page_alloc(struct cm_comp *c)
 	if (ss_state_alloc(&m->comp)) BUG();
 
 	/* Allocate page, map page */
-	p->page = crt_page_allocn(&c->comp, 1);
+	p->page = crt_page_allocn(&cm_self()->comp, 1);
 	if (!p->page) ERR_THROW(NULL, free_p);
 	if (crt_page_aliasn_in(p->page, 1, &cm_self()->comp, &c->comp, &m->addr)) BUG();
 
@@ -204,6 +204,7 @@ mm_page_allocn(struct cm_comp *c, unsigned long num_pages)
 		if ((prev->page + 4096) != p->page) {
 			BUG(); /* FIXME: handle concurrency */
 		}
+		prev = p;
 	}
 
 	return initial;

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ mm_page_alloc(struct cm_comp *c)`
`176`	`176`	`if (ss_state_alloc(&m->comp)) BUG();`
`177`	`177`
`178`	`178`	`/* Allocate page, map page */`
`179`		`- p->page = crt_page_allocn(&c->comp, 1);`
	`179`	`+ p->page = crt_page_allocn(&cm_self()->comp, 1);`
`180`	`180`	`if (!p->page) ERR_THROW(NULL, free_p);`
`181`	`181`	`if (crt_page_aliasn_in(p->page, 1, &cm_self()->comp, &c->comp, &m->addr)) BUG();`
`182`	`182`
`@@ -204,6 +204,7 @@ mm_page_allocn(struct cm_comp *c, unsigned long num_pages)`
`204`	`204`	`if ((prev->page + 4096) != p->page) {`
`205`	`205`	`BUG(); /* FIXME: handle concurrency */`
`206`	`206`	`}`
	`207`	`+ prev = p;`
`207`	`208`	`}`
`208`	`209`
`209`	`210`	`return initial;`