From: mpi <mpi@openbsd.org>
Date: Sat, 26 Apr 2014 14:26:48 +0000 (+0000)
Subject: Do not pass a NULL argument to OF_getprop(), even if it's fine for the
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=eb6ab24df1b981a048e27ba25f79928046382b6d;p=openbsd

Do not pass a NULL argument to OF_getprop(), even if it's fine for the
moment since we use an intermediate buffer and we specify a length of 0,
there's no need for an exception here.

Noticied while playing with the virtual-mode client interface of firmware.
---

diff --git a/sys/arch/macppc/pci/pci_machdep.c b/sys/arch/macppc/pci/pci_machdep.c
index 00634c334e8..11d4f5d9dd7 100644
--- a/sys/arch/macppc/pci/pci_machdep.c
+++ b/sys/arch/macppc/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.c,v 1.2 2013/10/13 16:36:46 mpi Exp $	*/
+/*	$OpenBSD: pci_machdep.c,v 1.3 2014/04/26 14:26:48 mpi Exp $	*/
 
 /*
  * Copyright (c) 2013 Martin Pieuchot
@@ -326,11 +326,13 @@ ofw_intr_map(int node, uint32_t *addr, uint32_t *intr)
 		parent = *mp1;
 
 		if (bcmp(mp, addr, mlen) == 0) {
+			char ic[20];
+
 			/*
 			 * If we have a match and the parent is not an
 			 * interrupt controller continue recursively.
 			 */
-			if (OF_getprop(parent, "interrupt-controller", NULL, 0))
+			if (OF_getprop(parent, "interrupt-controller", ic, 20))
 				return ofw_intr_map(parent, &mp1[1], intr);
 
 			*intr = mp1[1];