Module Name: src
Committed By: kiyohara
Date: Mon Jun 28 11:18:45 UTC 2010
Modified Files:
src/sys/arch/hpcsh/hpcsh: bus_space.c
src/sys/arch/hpcsh/include: bus.h
Log Message:
Fix always free. It call, if memory was allocated.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcsh/hpcsh/bus_space.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcsh/include/bus.h
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/hpcsh/hpcsh/bus_space.c
diff -u src/sys/arch/hpcsh/hpcsh/bus_space.c:1.15 src/sys/arch/hpcsh/hpcsh/bus_space.c:1.16
--- src/sys/arch/hpcsh/hpcsh/bus_space.c:1.15 Mon Apr 28 20:23:22 2008
+++ src/sys/arch/hpcsh/hpcsh/bus_space.c Mon Jun 28 11:18:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.15 2008/04/28 20:23:22 martin Exp $ */
+/* $NetBSD: bus_space.c,v 1.16 2010/06/28 11:18:44 kiyohara Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.15 2008/04/28 20:23:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.16 2010/06/28 11:18:44 kiyohara Exp $");
#include "debug_hpcsh.h"
@@ -138,11 +138,13 @@
bus_space_create(struct hpcsh_bus_space *hbs, const char *name,
bus_addr_t addr, bus_size_t size)
{
- if (hbs == NULL)
- hbs = malloc(sizeof(*hbs), M_DEVBUF, M_NOWAIT);
- KASSERT(hbs);
- memset(hbs, 0, sizeof(*hbs));
+ if (hbs == NULL) {
+ hbs = malloc(sizeof(*hbs), M_DEVBUF, M_NOWAIT | M_ZERO);
+ hbs->hbs_flags = HBS_FLAGS_ALLOCATED;
+ } else
+ memset(hbs, 0, sizeof(*hbs));
+ KASSERT(hbs);
/* set default method */
*hbs = __default_bus_space;
@@ -172,7 +174,8 @@
if (ex != NULL)
extent_destroy(ex);
- free(t, M_DEVBUF);
+ if (hbs->hbs_flags & HBS_FLAGS_ALLOCATED)
+ free(hbs, M_DEVBUF);
}
/* default bus_space tag */
Index: src/sys/arch/hpcsh/include/bus.h
diff -u src/sys/arch/hpcsh/include/bus.h:1.18 src/sys/arch/hpcsh/include/bus.h:1.19
--- src/sys/arch/hpcsh/include/bus.h:1.18 Sat Dec 5 16:29:12 2009
+++ src/sys/arch/hpcsh/include/bus.h Mon Jun 28 11:18:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.18 2009/12/05 16:29:12 pooka Exp $ */
+/* $NetBSD: bus.h,v 1.19 2010/06/28 11:18:44 kiyohara Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -119,6 +119,9 @@
/* cookie */
void *hbs_cookie;
+ int hbs_flags;
+#define HBS_FLAGS_ALLOCATED (1 < 0)
+
/* mapping/unmapping */
int (*hbs_map)(void *, bus_addr_t, bus_size_t,
int, bus_space_handle_t *);
