xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kernel: fix pointer truncation in xspanalloc(), fix format prints

Browse source
This commit is contained in:
cinap_lenrek 2014-02-01 10:17:53 +01:00
parent 7613608b23
commit dcea714680
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/src/9/port/xalloc.c
View file

@ -57,6 +57,7 @@ xinit(void)
upages = conf.upages;
kpages = conf.npage - upages;
pm = palloc.mem;
for(i=0; i<nelem(conf.mem); i++){
m = &conf.mem[i];
@ -99,7 +100,7 @@ xspanalloc(ulong size, int align, ulong span)
panic("xspanalloc: %lud %d %lux", size, align, span);
if(span > 2) {
v = (a + span) & ~(span-1);
v = (a + span) & ~((uintptr)span-1);
t = v - a;
if(t > 0)
xhole(PADDR(a), t);
@ -111,7 +112,7 @@ xspanalloc(ulong size, int align, ulong span)
v = a;
if(align > 1)
v = (v + align) & ~(align-1);
v = (v + align) & ~((uintptr)align-1);
return (void*)v;
}
@ -261,16 +262,17 @@ xsummary(void)
{
int i;
Hole *h;
uintptr s;
i = 0;
for(h = xlists.flist; h; h = h->link)
i++;
print("%d holes free\n", i);
i = 0;
s = 0;
for(h = xlists.table; h; h = h->link) {
print("%#p %#p %p\n", h->addr, h->top, h->size);
i += h->size;
s += h->size;
}
print("%d bytes free\n", i);
print("%lld bytes free\n", (vlong)s);
}