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

Fix a problem with fdtbus_get_phandle where we were passing size -1 to 

kmem_alloc when the property was not found. This seemed to work with
DIAGNOSTIC kernels, but panics in vmem with a non-DIAGNOSTIC kernel.
This commit is contained in:
jmcneill 2017-07-19 20:18:07 +00:00
parent b5afb4ec18
commit e281dc3c90
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/fdt/fdt_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fdt_subr.c,v 1.16 2017/07/08 12:36:51 jmcneill Exp $ */
/* $NetBSD: fdt_subr.c,v 1.17 2017/07/19 20:18:07 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
@ -27,11 +27,10 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.16 2017/07/08 12:36:51 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.17 2017/07/19 20:18:07 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/kmem.h>
#include <libfdt.h>
#include <dev/fdt/fdtvar.h>
@ -108,22 +107,15 @@ int
fdtbus_get_phandle(int phandle, const char *prop)
{
u_int phandle_ref;
u_int *buf;
const u_int *buf;
int len;
len = OF_getproplen(phandle, prop);
if (len < sizeof(phandle_ref))
buf = fdt_getprop(fdtbus_get_data(),
fdtbus_phandle2offset(phandle), prop, &len);
if (buf == NULL || len < sizeof(phandle_ref))
return -1;
buf = kmem_alloc(len, KM_SLEEP);
if (OF_getprop(phandle, prop, buf, len) != len) {
kmem_free(buf, len);
return -1;
}
phandle_ref = fdt32_to_cpu(buf[0]);
kmem_free(buf, len);
phandle_ref = be32dec(buf);
return fdtbus_get_phandle_from_native(phandle_ref);
}