CVS commit: src/sys/arch/sparc64/dev

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sun Sep 21 16:39:12 UTC 2014

Modified Files:
        src/sys/arch/sparc64/dev: psycho.c schizo.c

Log Message:
fix leak


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc64/dev/schizo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.118 src/sys/arch/sparc64/dev/psycho.c:1.119
--- src/sys/arch/sparc64/dev/psycho.c:1.118	Sat Dec  7 06:17:24 2013
+++ src/sys/arch/sparc64/dev/psycho.c	Sun Sep 21 12:39:12 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: psycho.c,v 1.118 2013/12/07 11:17:24 nakayama Exp $	*/
+/*	$NetBSD: psycho.c,v 1.119 2014/09/21 16:39:12 christos Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.118 2013/12/07 11:17:24 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.119 2014/09/21 16:39:12 christos Exp $");
 
 #include "opt_ddb.h"
 
@@ -1272,8 +1272,7 @@ psycho_intr_establish(bus_space_tag_t t,
 	int ino;
 	long vec = INTVEC(ihandle);
 
-	ih = (struct intrhand *)
-		malloc(sizeof(struct intrhand), M_DEVBUF, M_NOWAIT);
+	ih = malloc(sizeof(struct intrhand), M_DEVBUF, M_NOWAIT);
 	if (ih == NULL)
 		return (NULL);
 
@@ -1342,6 +1341,7 @@ psycho_intr_establish(bus_space_tag_t t,
 	}
 
 	printf("Cannot find interrupt vector %lx\n", vec);
+	free(ih, M_DEVBUF);
 	return (NULL);
 
 found:

Index: src/sys/arch/sparc64/dev/schizo.c
diff -u src/sys/arch/sparc64/dev/schizo.c:1.31 src/sys/arch/sparc64/dev/schizo.c:1.32
--- src/sys/arch/sparc64/dev/schizo.c:1.31	Fri Jun 21 16:09:58 2013
+++ src/sys/arch/sparc64/dev/schizo.c	Sun Sep 21 12:39:12 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: schizo.c,v 1.31 2013/06/21 20:09:58 nakayama Exp $	*/
+/*	$NetBSD: schizo.c,v 1.32 2014/09/21 16:39:12 christos Exp $	*/
 /*	$OpenBSD: schizo.c,v 1.55 2008/08/18 20:29:37 brad Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.31 2013/06/21 20:09:58 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.32 2014/09/21 16:39:12 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -195,6 +195,7 @@ schizo_attach(device_t parent, device_t 
 			  ma->ma_reg[0].ur_len,
 			  BUS_SPACE_MAP_LINEAR, &pbm->sp_intrh)) {
 		aprint_error(": failed to interrupt map registers\n");
+		kmem_free(pbm, sizeof(*pbm));
 		return;
 	}