crunchgen: fix NULL-deref bug introduced in r364647
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:
parent
ff15f3f133
commit
f7ff7baaf6
@ -2270,7 +2270,7 @@ _bootstrap_tools_links+=crunchide
|
||||
|
||||
# 1300115: Higher WARNS fixes
|
||||
.if ${BOOTSTRAPPING} < 1202502 || \
|
||||
(${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300115)
|
||||
(${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300131)
|
||||
_crunchgen= usr.sbin/crunch/crunchgen
|
||||
.else
|
||||
_bootstrap_tools_links+=crunchgen
|
||||
|
@ -97,9 +97,9 @@ find_entry_point(const char *basename)
|
||||
|
||||
for (ep = entry_points; ep->name != NULL; ep++)
|
||||
if (!strcmp(basename, ep->name))
|
||||
break;
|
||||
|
||||
return (ep);
|
||||
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
static const char *
|
||||
|
Loading…
Reference in New Issue
Block a user