d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix null string handling in ofw_real_nextprop function. Pass the right

Browse Source 
length to ofw_real_map in case of a null string.
This makes ofwdump(8) work correctly when trying to print all properties
with ofwdump -p.

Approved by:	nwhitehorn (mentor)
This commit is contained in:
Andreas Tobler 2011-01-05 21:38:02 +00:00
parent 9a17b89ccf
commit ec664c11dc
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/powerpc/ofw/ofw_real.c
View File

@ -266,7 +266,11 @@ ofw_real_map(const void *buf, size_t len)
return 0;
}
memcpy(of_bounce_virt + of_bounce_offset, buf, len);
if (buf != NULL)
memcpy(of_bounce_virt + of_bounce_offset, buf, len);
else
return (0);
phys = of_bounce_phys + of_bounce_offset;
of_bounce_offset += len;
@ -282,6 +286,9 @@ ofw_real_unmap(cell_t physaddr, void *buf, size_t len)
if (of_bounce_virt == NULL)
return;
if (physaddr == 0)
return;
memcpy(buf,of_bounce_virt + (physaddr - of_bounce_phys),len);
}
@ -546,11 +553,10 @@ ofw_real_nextprop(ofw_t ofw, phandle_t package, const char *previous,
ofw_real_start();
args.package = package;
args.previous = ofw_real_map(previous, strlen(previous) + 1);
args.previous = ofw_real_map(previous, (previous != NULL) ? (strlen(previous) + 1) : 0);
args.buf = ofw_real_map(buf, size);
argsptr = ofw_real_map(&args, sizeof(args));
if (args.previous == 0 || args.buf == 0 ||
openfirmware((void *)argsptr) == -1) {
if (args.buf == 0 || openfirmware((void *)argsptr) == -1) {
ofw_real_stop();
return (-1);
}