Module Name: src
Committed By: jruoho
Date: Wed Jun 30 07:58:11 UTC 2010
Modified Files:
src/sys/dev/acpi/wmi: wmi_dell.c wmi_hp.c
Log Message:
Initialize pointers to NULL. Otherwise we may try to free garbage.
Tries to address a panic reported by David Demelier in PR kern/43504.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/wmi/wmi_dell.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/wmi/wmi_hp.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/dev/acpi/wmi/wmi_dell.c
diff -u src/sys/dev/acpi/wmi/wmi_dell.c:1.3 src/sys/dev/acpi/wmi/wmi_dell.c:1.4
--- src/sys/dev/acpi/wmi/wmi_dell.c:1.3 Thu Apr 8 12:14:19 2010
+++ src/sys/dev/acpi/wmi/wmi_dell.c Wed Jun 30 07:58:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_dell.c,v 1.3 2010/04/08 12:14:19 jruoho Exp $ */
+/* $NetBSD: wmi_dell.c,v 1.4 2010/06/30 07:58:11 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_dell.c,v 1.3 2010/04/08 12:14:19 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_dell.c,v 1.4 2010/06/30 07:58:11 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -167,6 +167,8 @@
ACPI_STATUS rv;
uint32_t val;
+ buf.Pointer = NULL;
+
sc = device_private(self);
rv = acpi_wmi_event_get(sc->sc_parent, evt, &buf);
Index: src/sys/dev/acpi/wmi/wmi_hp.c
diff -u src/sys/dev/acpi/wmi/wmi_hp.c:1.1 src/sys/dev/acpi/wmi/wmi_hp.c:1.2
--- src/sys/dev/acpi/wmi/wmi_hp.c:1.1 Thu Apr 8 17:32:30 2010
+++ src/sys/dev/acpi/wmi/wmi_hp.c Wed Jun 30 07:58:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_hp.c,v 1.1 2010/04/08 17:32:30 jruoho Exp $ */
+/* $NetBSD: wmi_hp.c,v 1.2 2010/06/30 07:58:11 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_hp.c,v 1.1 2010/04/08 17:32:30 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_hp.c,v 1.2 2010/06/30 07:58:11 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -252,6 +252,8 @@
ACPI_STATUS rv;
uint32_t val;
+ buf.Pointer = NULL;
+
sc = device_private(self);
rv = acpi_wmi_event_get(sc->sc_parent, evt, &buf);
@@ -343,6 +345,7 @@
KDASSERT(cmd != 0);
KDASSERT(sc->sc_arg[0] == WMI_HP_METHOD_ARG_MAGIC);
+ obuf.Pointer = NULL;
ibuf.Pointer = sc->sc_arg;
ibuf.Length = WMI_HP_METHOD_ARG_SIZE;
