Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid leak in error branch, noted by maxv@, compile-tested for vax.

This commit is contained in:
riastradh 2014-08-18 04:16:59 +00:00
parent fef866671e
commit 4ce21324f0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/qbus/if_qe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_qe.c,v 1.72 2013/10/25 15:42:50 martin Exp $ */
/* $NetBSD: if_qe.c,v 1.73 2014/08/18 04:16:59 riastradh Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.72 2013/10/25 15:42:50 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.73 2014/08/18 04:16:59 riastradh Exp $");
#include "opt_inet.h"
@ -142,7 +142,7 @@ qematch(device_t parent, cfdata_t cf, void *aux)
#define PROBESIZE 4096
struct qe_ring *ring;
struct qe_ring *rp;
int error;
int error, match;
ring = malloc(PROBESIZE, M_TEMP, M_WAITOK|M_ZERO);
memset(sc, 0, sizeof(*sc));
@ -161,8 +161,10 @@ qematch(device_t parent, cfdata_t cf, void *aux)
*/
ui.ui_size = PROBESIZE;
ui.ui_vaddr = (void *)&ring[0];
if ((error = uballoc(uh, &ui, UBA_CANTWAIT)))
return 0;
if ((error = uballoc(uh, &ui, UBA_CANTWAIT))) {
match = 0;
goto out0;
}
/*
* Init a simple "fake" receive and transmit descriptor that
@ -192,12 +194,14 @@ qematch(device_t parent, cfdata_t cf, void *aux)
QE_WCSR(QE_CSR_XMTH, HIWORD(rp));
DELAY(10000);
match = 1;
/*
* All done with the bus resources.
*/
ubfree(uh, &ui);
free(ring, M_TEMP);
return 1;
out0: free(ring, M_TEMP);
return match;
}
/*