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

crunchgen: fix NULL-deref bug introduced in r364647

Browse Source 
While porting over the local changes from CheriBSD for upstreaming, I
accidentally committed a broken version of find_entry_point(): we have to
return NULL if the value is not found instead of a value with
ep->name == NULL, since the checks in main were changed to check ep instead
of ep->name for NULL.

This only matters if the crunched tool cannot be found using normal lookup
and one of the fallback paths is used, so it's unlikely to be triggered
in rescue. However, I noticed that one of our CheriBSD test scripts was
failing to run commands under `su` on minimal disk images where all
binaries are hardlinks to a `cheribsdbox` tool generated with crunchgen.

This also updates the bootstrapping check in Makefile.inc1 to bootstrap
crunchgen up to the next version bump.

Reviewed By:	kevans
Differential Revision: https://reviews.freebsd.org/D27474
This commit is contained in:
Alex Richardson 2020-12-04 15:53:37 +00:00
parent ff15f3f133
commit f7ff7baaf6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -2270,7 +2270,7 @@ _bootstrap_tools_links+=crunchide
# 1300115: Higher WARNS fixes # 1300115: Higher WARNS fixes
.if ${BOOTSTRAPPING} < 1202502 || \ .if ${BOOTSTRAPPING} < 1202502 || \
(${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300115) (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300131)
_crunchgen= usr.sbin/crunch/crunchgen _crunchgen= usr.sbin/crunch/crunchgen
.else .else
_bootstrap_tools_links+=crunchgen _bootstrap_tools_links+=crunchgen

4
usr.sbin/crunch/crunchgen/crunched_main.c
View File

@ -97,9 +97,9 @@ find_entry_point(const char *basename)
for (ep = entry_points; ep->name != NULL; ep++) for (ep = entry_points; ep->name != NULL; ep++)
if (!strcmp(basename, ep->name)) if (!strcmp(basename, ep->name))
break; return (ep);
return (ep); return (NULL);
} }
static const char * static const char *