Page MenuHomeFreeBSD
Differential D35618

installworld: improve portability of ldd use
ClosedPublic
Actions

Authored by brooks on Jun 28 2022, 12:40 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 11, 1:39 AM
Unknown Object (File)
Thu, Mar 20, 2:16 AM
Unknown Object (File)
Mar 12 2025, 10:12 PM
Unknown Object (File)
Mar 10 2025, 12:12 PM
Unknown Object (File)
Feb 24 2025, 6:59 AM
Unknown Object (File)
Feb 13 2025, 6:06 PM
Unknown Object (File)
Jan 24 2025, 10:58 PM
Unknown Object (File)
Jan 24 2025, 10:22 PM
View All 72 Files
Subscribers
imp

Details

Reviewers
emaste
kib
cy
Commits
rGfe89e1a629db: installworld: improve portability of ldd use
rGc9f9dc96d908: installworld: improve portability of ldd use
rGbda5d2a45c8d: installworld: improve portability of ldd use
Summary

b3b462229f97 added a case statement to ignore lines containing strings
in square brackets such as "[vdso]" and "[preloaded]". On MacOS
Monterey where /bin/sh may be zsh, this fails with:

/bin/sh: -c: line 0: syntax error near unexpected token `;;'

Invoke grep in the pipeline to remove such lines instead.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 46144
Build 43033: arc lint + arc unit

Revision Contents
Changeset List

PathSize
6 lines

Diff 107457

View Options

Makefile.inc1

Show First 20 Lines • Show All 231 Lines • ▼ Show 20 Lines
static int static int
parse_pnp_list(const char *desc, char **new_desc, pnp_list *list) parse_pnp_list(const char *desc, char **new_desc, pnp_list *list)
{ {
const char *walker, *ep; const char *walker, *ep;
const char *colon, *semi; const char *colon, *semi;
struct pnp_elt *elt; struct pnp_elt *elt;
char *nd; char *nd;
char type[8], key[32]; char type[8], key[32];
char buf[1024];
size_t ndspace;
int off; int off;
walker = desc; walker = desc;
ep = desc + strlen(desc); ep = desc + strlen(desc);
off = 0; off = 0;
nd = *new_desc = malloc(strlen(desc) + 1); nd = buf;
ndspace = sizeof(buf);
nd[0] = '\0';
if (verbose > 1) if (verbose > 1)
printf("Converting %s into a list\n", desc); printf("Converting %s into a list\n", desc);
while (walker < ep) { while (walker < ep) {
colon = strchr(walker, ':'); colon = strchr(walker, ':');
semi = strchr(walker, ';'); semi = strchr(walker, ';');
if (semi != NULL && semi < colon) if (semi != NULL && semi < colon)
goto err; goto err;
if (colon - walker > sizeof(type)) if (colon - walker > sizeof(type))
▲ Show 20 Lines • Show All 77 Lines • ▼ Show 20 Lines while (walker < ep) {
} else if (elt->pe_kind == TYPE_T) { } else if (elt->pe_kind == TYPE_T) {
/* doesn't actually consume space in the table */ /* doesn't actually consume space in the table */
off = elt->pe_offset; off = elt->pe_offset;
} else { } else {
elt->pe_offset = roundup2(elt->pe_offset, sizeof(void *)); elt->pe_offset = roundup2(elt->pe_offset, sizeof(void *));
off = elt->pe_offset + sizeof(void *); off = elt->pe_offset + sizeof(void *);
} }
if (elt->pe_kind & TYPE_PAIRED) { if (elt->pe_kind & TYPE_PAIRED) {
char *word, *ctx; char *word, *ctx, type;
int n;
for (word = strtok_r(key, "/", &ctx); for (word = strtok_r(key, "/", &ctx);
word; word = strtok_r(NULL, "/", &ctx)) { word; word = strtok_r(NULL, "/", &ctx)) {
sprintf(nd, "%c:%s;", elt->pe_kind & TYPE_FLAGGED ? 'J' : 'I', type = elt->pe_kind & TYPE_FLAGGED ? 'J' : 'I';
word); n = snprintf(nd, ndspace, "%c:%s;", type, word);
nd += strlen(nd); if (n >= ndspace)
errx(1, "Exhausted space converting "
"description %s", desc);
nd += n;
ndspace -= n;
} }
} }
else { else {
char type;
int n;
if (elt->pe_kind & TYPE_FLAGGED) if (elt->pe_kind & TYPE_FLAGGED)
*nd++ = 'J'; type = 'J';
else if (elt->pe_kind & TYPE_GE) else if (elt->pe_kind & TYPE_GE)
*nd++ = 'G'; type = 'G';
else if (elt->pe_kind & TYPE_LE) else if (elt->pe_kind & TYPE_LE)
*nd++ = 'L'; type = 'L';
else if (elt->pe_kind & TYPE_MASK) else if (elt->pe_kind & TYPE_MASK)
*nd++ = 'M'; type = 'M';
else if (elt->pe_kind & TYPE_INT) else if (elt->pe_kind & TYPE_INT)
*nd++ = 'I'; type = 'I';
else if (elt->pe_kind == TYPE_D) else if (elt->pe_kind == TYPE_D)
*nd++ = 'D'; type = 'D';
else if (elt->pe_kind == TYPE_Z || elt->pe_kind == TYPE_E) else if (elt->pe_kind == TYPE_Z || elt->pe_kind == TYPE_E)
*nd++ = 'Z'; type = 'Z';
else if (elt->pe_kind == TYPE_T) else if (elt->pe_kind == TYPE_T)
*nd++ = 'T'; type = 'T';
else else
errx(1, "Impossible type %x\n", elt->pe_kind); errx(1, "Impossible type %x\n", elt->pe_kind);
*nd++ = ':'; n = snprintf(nd, ndspace, "%c:%s;", type, key);
strcpy(nd, key); if (n >= ndspace)
nd += strlen(nd); errx(1, "Exhausted space converting "
*nd++ = ';'; "description %s", desc);
impUnsubmitted
Not Done
Inline Actions

It would be better to just ignore this module in this case.

imp: It would be better to just ignore this module in this case.
kibUnsubmitted
Not Done
Inline Actions

I think a vitally important data to print for user is the kld name that is causing troubles. At least, the file can be removed and kldxref re-run.

kib: I think a vitally important data to print for user is the kld name that is causing troubles.
jrtc27AuthorUnsubmitted
Done
Inline Actions

I think a vitally important data to print for user is the kld name that is causing troubles. At least, the file can be removed and kldxref re-run.

The same is true for all the other errors in this function and others like record_buf and record_string, as well as everything that calls check. Ideally the error reporting would be overhauled, but the file name is not currently available here so that change would be more invasive (and would only fix one of the many problems). Plus if you get one of these cryptic errors you can run it with -v to see what file it choked on.

jrtc27: > I think a vitally important data to print for user is the kld name that is causing troubles.
jrtc27AuthorUnsubmitted
Done
Inline Actions

Well, check itself is a bit dodgy (a hidden break on error) but not inherently problematic, except that parse_entry's return value is never consulted. Lots of issues here if you want good error reporting.

jrtc27: Well, `check` itself is a bit dodgy (a hidden `break` on error) but not inherently problematic…
nd += n;
ndspace -= n;
} }
} }
*nd++ = '\0'; *new_desc = strdup(buf);
return (0); return (0);
err: err:
errx(1, "Parse error of description string %s", desc); errx(1, "Parse error of description string %s", desc);
} }
static int static int
parse_entry(struct mod_metadata *md, const char *cval, parse_entry(struct mod_metadata *md, const char *cval,
struct elf_file *ef, const char *kldname) struct elf_file *ef, const char *kldname)
▲ Show 20 Lines • Show All 381 Lines • Show Last 20 Lines