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

pcuart: malloc error handling, cleanup

Browse source
This commit is contained in:
cinap_lenrek 2013-05-20 17:32:48 +02:00
parent 6ac8a3ca65
commit c4f57ff492
2 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/src/9/pc/uartisa.c
View file

@ -18,16 +18,22 @@ uartisa(int ctlrno, ISAConf* isa)
Uart *uart;
char buf[64];
uart = malloc(sizeof(Uart));
if(uart == nil){
print("uartisa: no memory for Uart\n");
return nil;
}
io = isa->port;
snprint(buf, sizeof(buf), "%s%d", isaphysuart.name, ctlrno);
if(ioalloc(io, 8, 0, buf) < 0){
print("uartisa: I/O 0x%uX in use\n", io);
free(uart);
return nil;
}
uart = malloc(sizeof(Uart));
ctlr = i8250alloc(io, isa->irq, BUSUNKNOWN);
if(uart == nil || ctlr == nil){
if(ctlr == nil){
iofree(io);
free(uart);
return nil;

34
sys/src/9/pc/uartpci.c
View file

@ -21,17 +21,23 @@ uartpci(int ctlrno, Pcidev* p, int barno, int n, int freq, char* name,
char buf[64];
Uart *head, *uart;
head = malloc(sizeof(Uart)*n);
if(head == nil){
print("uartpci: no memory for Uarts\n");
return nil;
}
io = p->mem[barno].bar & ~0x01;
snprint(buf, sizeof(buf), "%s%d", pciphysuart.name, ctlrno);
if(ioalloc(io, p->mem[barno].size, 0, buf) < 0){
print("uartpci: I/O 0x%uX in use\n", io);
free(head);
return nil;
}
head = uart = malloc(sizeof(Uart)*n);
uart = head;
for(i = 0; i < n; i++){
ctlr = i8250alloc(io, p->intl, p->tbdf);
io += iosize;
ctlr = i8250alloc(io + i*iosize, p->intl, p->tbdf);
if(ctlr == nil)
continue;
@ -44,16 +50,20 @@ uartpci(int ctlrno, Pcidev* p, int barno, int n, int freq, char* name,
(uart-1)->next = uart;
uart++;
}
if (head) {
if(perlehead != nil)
perletail->next = head;
else
perlehead = head;
for(perletail = head; perletail->next != nil;
perletail = perletail->next)
;
if(head == uart){
iofree(io);
free(head);
return nil;
}
if(perlehead != nil)
perletail->next = head;
else
perlehead = head;
for(perletail = head; perletail->next != nil;
perletail = perletail->next)
;
return head;
}