hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-14 22:32:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

ldconfig: Retire a.out support

Browse Source 
aout support in ldconfig hasn't been required since FreeBSD 2.x.
If someone needs to use FreeBSD 2 shared libraries they will be best
served by using a FreeBSD 2 ldconfig as well.

In aa5e1b42e6 we removed the ldconfig a.out invocation from rc.d but
left the support in ldconfig itself.  Remove it now.

Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D27481
This commit is contained in:
Ed Maste 2020-12-31 10:29:08 -05:00
parent a3c29cdbd4
commit 50a40d0911
3 changed files with 15 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/ldconfig/Makefile
View File

@ -2,11 +2,7 @@
PACKAGE=runtime PACKAGE=runtime
PROG= ldconfig PROG= ldconfig
SRCS= elfhints.c ldconfig.c shlib.c support.c SRCS= elfhints.c ldconfig.c
LDDIR?= ${SRCTOP}/libexec/rtld-aout
CFLAGS+=-I${LDDIR} -DFREEBSD_AOUT
MAN= ldconfig.8 MAN= ldconfig.8
.PATH: ${LDDIR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

10
sbin/ldconfig/ldconfig.8
View File

@ -29,7 +29,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd March 17, 2020 .Dd December 31, 2020
.Dt LDCONFIG 8 .Dt LDCONFIG 8
.Os .Os
.Sh NAME .Sh NAME
@ -38,7 +38,7 @@
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm .Nm
.Op Fl 32 .Op Fl 32
.Op Fl aout | Fl elf .Op Fl elf
.Op Fl Rimrsv .Op Fl Rimrsv
.Op Fl f Ar hints_file .Op Fl f Ar hints_file
.Op Ar directory | Ar .Op Ar directory | Ar
@ -109,12 +109,8 @@ The following options are recognized by
.It Fl 32 .It Fl 32
Generate the hints for 32-bit ABI shared libraries Generate the hints for 32-bit ABI shared libraries
on 64-bit systems that support running 32-bit binaries. on 64-bit systems that support running 32-bit binaries.
.It Fl aout
Generate the hints for a.out format shared libraries.
This option is deprecated and is not present in
.Fx 13 .
.It Fl elf .It Fl elf
Generate the hints for ELF format shared libraries. Ignored for backwards compatibility.
.It Fl R .It Fl R
Rescan the previously configured directories. Rescan the previously configured directories.
This opens the previous hints This opens the previous hints

511
sbin/ldconfig/ldconfig.c
View File

@ -46,20 +46,15 @@ static const char rcsid[] =
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/link_aout.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "ldconfig.h" #include "ldconfig.h"
#include "shlib.h"
#include "support.h"
#if DEBUG #if DEBUG
/* test */ /* test */
#undef _PATH_LD_HINTS
#define _PATH_LD_HINTS "./ld.so.hints"
#undef _PATH_ELF_HINTS #undef _PATH_ELF_HINTS
#define _PATH_ELF_HINTS "./ld-elf.so.hints" #define _PATH_ELF_HINTS "./ld-elf.so.hints"
#endif #endif
@ -78,52 +73,19 @@ static int merge;
static int rescan; static int rescan;
static const char *hints_file; static const char *hints_file;
struct shlib_list {
/* Internal list of shared libraries found */
char *name;
char *path;
int dewey[MAXDEWEY];
int ndewey;
#define major dewey[0]
#define minor dewey[1]
struct shlib_list *next;
};
static struct shlib_list *shlib_head = NULL, **shlib_tail = &shlib_head;
static char *dir_list;
static int buildhints(void);
static int dodir(char *, int);
int dofile(char *, int);
static void enter(char *, char *, char *, int *, int);
static void listhints(void);
static int readhints(void);
static void usage(void); static void usage(void);
/*
* Note on aout/a.out support.
* To properly support shared libraries for compat2x, which are a.out, we need
* to support a.out here. As of 2013, bug reports are still coming in for this
* feature (on amd64 no less), so we know it is still in use.
*/
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int i, c; int c;
int rval = 0;
int is_aout = 0;
int is_32 = 0; int is_32 = 0;
int is_soft = 0; int is_soft = 0;
while (argc > 1) { while (argc > 1) {
if (strcmp(argv[1], "-aout") == 0) { if (strcmp(argv[1], "-aout") == 0) {
warnx("aout support is deprecated"); errx(1, "aout is not supported");
is_aout = 1;
argc--;
argv++;
} else if (strcmp(argv[1], "-elf") == 0) { } else if (strcmp(argv[1], "-elf") == 0) {
is_aout = 0;
argc--; argc--;
argv++; argv++;
} else if (strcmp(argv[1], "-32") == 0) { } else if (strcmp(argv[1], "-32") == 0) {
@ -142,9 +104,9 @@ main(int argc, char **argv)
if (is_soft) if (is_soft)
hints_file = _PATH_ELFSOFT_HINTS; /* Never will have a.out softfloat */ hints_file = _PATH_ELFSOFT_HINTS; /* Never will have a.out softfloat */
else if (is_32) else if (is_32)
hints_file = is_aout ? _PATH_LD32_HINTS : _PATH_ELF32_HINTS; hints_file = _PATH_ELF32_HINTS;
else else
hints_file = is_aout ? _PATH_LD_HINTS : _PATH_ELF_HINTS; hints_file = _PATH_ELF_HINTS;
if (argc == 1) if (argc == 1)
rescan = 1; rescan = 1;
else while((c = getopt(argc, argv, "Rf:imrsv")) != -1) { else while((c = getopt(argc, argv, "Rf:imrsv")) != -1) {
@ -176,469 +138,18 @@ main(int argc, char **argv)
} }
} }
if (!is_aout) { if (justread)
if (justread) list_elf_hints(hints_file);
list_elf_hints(hints_file); else
else update_elf_hints(hints_file, argc - optind,
update_elf_hints(hints_file, argc - optind, argv + optind, merge || rescan);
argv + optind, merge || rescan); return 0;
return 0;
}
/* Here begins the aout libs processing */
dir_list = strdup("");
if (justread || merge || rescan) {
if ((rval = readhints()) != 0)
return rval;
}
if (!nostd && !merge && !rescan)
std_search_path();
/* Add any directories/files from the command line */
if (!justread) {
for (i = optind; i < argc; i++) {
struct stat stbuf;
if (stat(argv[i], &stbuf) == -1) {
warn("%s", argv[i]);
rval = -1;
} else if (strcmp(argv[i], "/usr/lib") == 0) {
warnx("WARNING! '%s' can not be used", argv[i]);
rval = -1;
} else {
/*
* See if this is a directory-containing
* file instead of a directory
*/
if (S_ISREG(stbuf.st_mode))
rval |= dofile(argv[i], 0);
else
add_search_path(argv[i]);
}
}
}
for (i = 0; i < n_search_dirs; i++) {
char *cp = concat(dir_list, *dir_list?":":"", search_dirs[i]);
free(dir_list);
dir_list = cp;
}
if (justread) {
listhints();
return 0;
}
for (i = 0; i < n_search_dirs; i++)
rval |= dodir(search_dirs[i], 1);
rval |= buildhints();
return rval;
} }
static void static void
usage(void) usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"usage: ldconfig [-32] [-aout | -elf] [-Rimrsv] [-f hints_file] [directory | file ...]\n"); "usage: ldconfig [-32] [-elf] [-Rimrsv] [-f hints_file] [directory | file ...]\n");
exit(1); exit(1);
} }
int
dofile(char *fname, int silent)
{
FILE *hfp;
char buf[MAXPATHLEN];
int rval = 0;
char *cp, *sp;
if ((hfp = fopen(fname, "r")) == NULL) {
warn("%s", fname);
return -1;
}
while (fgets(buf, sizeof(buf), hfp)) {
cp = buf;
while (isspace(*cp))
cp++;
if (*cp == '#' || *cp == '\0')
continue;
sp = cp;
while (!isspace(*cp) && *cp != '\0')
cp++;
if (*cp != '\n') {
*cp = '\0';
warnx("%s: trailing characters ignored", sp);
}
*cp = '\0';
rval |= dodir(sp, silent);
}
(void)fclose(hfp);
return rval;
}
int
dodir(char *dir, int silent)
{
DIR *dd;
struct dirent *dp;
char name[MAXPATHLEN];
int dewey[MAXDEWEY], ndewey;
if ((dd = opendir(dir)) == NULL) {
if (silent && errno == ENOENT) /* Ignore the error */
return 0;
warn("%s", dir);
return -1;
}
while ((dp = readdir(dd)) != NULL) {
int n;
char *cp;
/* Check for `lib' prefix */
if (dp->d_name[0] != 'l' ||
dp->d_name[1] != 'i' ||
dp->d_name[2] != 'b')
continue;
/* Copy the entry minus prefix */
(void)strcpy(name, dp->d_name + 3);
n = strlen(name);
if (n < 4)
continue;
/* Find ".so." in name */
for (cp = name + n - 4; cp > name; --cp) {
if (cp[0] == '.' &&
cp[1] == 's' &&
cp[2] == 'o' &&
cp[3] == '.')
break;
}
if (cp <= name)
continue;
*cp = '\0';
if (!isdigit(*(cp+4)))
continue;
bzero((caddr_t)dewey, sizeof(dewey));
ndewey = getdewey(dewey, cp + 4);
if (ndewey < 2)
continue;
enter(dir, dp->d_name, name, dewey, ndewey);
}
closedir(dd);
return 0;
}
static void
enter(char *dir, char *file, char *name, int dewey[], int ndewey)
{
struct shlib_list *shp;
for (shp = shlib_head; shp; shp = shp->next) {
if (strcmp(name, shp->name) != 0 || major != shp->major)
continue;
/* Name matches existing entry */
if (cmpndewey(dewey, ndewey, shp->dewey, shp->ndewey) > 0) {
/* Update this entry with higher versioned lib */
if (verbose)
printf("Updating lib%s.%d.%d to %s/%s\n",
shp->name, shp->major, shp->minor,
dir, file);
free(shp->name);
shp->name = strdup(name);
free(shp->path);
shp->path = concat(dir, "/", file);
bcopy(dewey, shp->dewey, sizeof(shp->dewey));
shp->ndewey = ndewey;
}
break;
}
if (shp)
/* Name exists: older version or just updated */
return;
/* Allocate new list element */
if (verbose)
printf("Adding %s/%s\n", dir, file);
shp = (struct shlib_list *)xmalloc(sizeof *shp);
shp->name = strdup(name);
shp->path = concat(dir, "/", file);
bcopy(dewey, shp->dewey, sizeof(shp->dewey));
shp->ndewey = ndewey;
shp->next = NULL;
*shlib_tail = shp;
shlib_tail = &shp->next;
}
static int
hinthash(char *cp, int vmajor)
{
int k = 0;
while (*cp)
k = (((k << 1) + (k >> 14)) ^ (*cp++)) & 0x3fff;
k = (((k << 1) + (k >> 14)) ^ (vmajor*257)) & 0x3fff;
return k;
}
int
buildhints(void)
{
struct hints_header hdr;
struct hints_bucket *blist;
struct shlib_list *shp;
char *strtab;
int i, n, str_index = 0;
int strtab_sz = 0; /* Total length of strings */
int nhints = 0; /* Total number of hints */
int fd;
char *tmpfilename;
for (shp = shlib_head; shp; shp = shp->next) {
strtab_sz += 1 + strlen(shp->name);
strtab_sz += 1 + strlen(shp->path);
nhints++;
}
/* Fill hints file header */
hdr.hh_magic = HH_MAGIC;
hdr.hh_version = LD_HINTS_VERSION_2;
hdr.hh_nbucket = 1 * nhints;
n = hdr.hh_nbucket * sizeof(struct hints_bucket);
hdr.hh_hashtab = sizeof(struct hints_header);
hdr.hh_strtab = hdr.hh_hashtab + n;
hdr.hh_dirlist = strtab_sz;
strtab_sz += 1 + strlen(dir_list);
hdr.hh_strtab_sz = strtab_sz;
hdr.hh_ehints = hdr.hh_strtab + hdr.hh_strtab_sz;
if (verbose)
printf("Totals: entries %d, buckets %ld, string size %d\n",
nhints, (long)hdr.hh_nbucket, strtab_sz);
/* Allocate buckets and string table */
blist = (struct hints_bucket *)xmalloc(n);
bzero((char *)blist, n);
for (i = 0; i < hdr.hh_nbucket; i++)
/* Empty all buckets */
blist[i].hi_next = -1;
strtab = (char *)xmalloc(strtab_sz);
/* Enter all */
for (shp = shlib_head; shp; shp = shp->next) {
struct hints_bucket *bp;
bp = blist +
(hinthash(shp->name, shp->major) % hdr.hh_nbucket);
if (bp->hi_pathx) {
int j;
for (j = 0; j < hdr.hh_nbucket; j++) {
if (blist[j].hi_pathx == 0)
break;
}
if (j == hdr.hh_nbucket) {
warnx("bummer!");
return -1;
}
while (bp->hi_next != -1)
bp = &blist[bp->hi_next];
bp->hi_next = j;
bp = blist + j;
}
/* Insert strings in string table */
bp->hi_namex = str_index;
strcpy(strtab + str_index, shp->name);
str_index += 1 + strlen(shp->name);
bp->hi_pathx = str_index;
strcpy(strtab + str_index, shp->path);
str_index += 1 + strlen(shp->path);
/* Copy versions */
bcopy(shp->dewey, bp->hi_dewey, sizeof(bp->hi_dewey));
bp->hi_ndewey = shp->ndewey;
}
/* Copy search directories */
strcpy(strtab + str_index, dir_list);
str_index += 1 + strlen(dir_list);
/* Sanity check */
if (str_index != strtab_sz) {
errx(1, "str_index(%d) != strtab_sz(%d)", str_index, strtab_sz);
}
tmpfilename = concat(hints_file, ".XXXXXXXXXX", "");
umask(0); /* Create with exact permissions */
if ((fd = mkstemp(tmpfilename)) == -1) {
warn("%s", tmpfilename);
return -1;
}
fchmod(fd, 0444);
if (write(fd, &hdr, sizeof(struct hints_header)) !=
sizeof(struct hints_header)) {
warn("%s", hints_file);
return -1;
}
if (write(fd, blist, hdr.hh_nbucket * sizeof(*blist)) !=
(ssize_t)(hdr.hh_nbucket * sizeof(*blist))) {
warn("%s", hints_file);
return -1;
}
if (write(fd, strtab, strtab_sz) != strtab_sz) {
warn("%s", hints_file);
return -1;
}
if (close(fd) != 0) {
warn("%s", hints_file);
return -1;
}
if (rename(tmpfilename, hints_file) != 0) {
warn("%s", hints_file);
return -1;
}
return 0;
}
static int
readhints(void)
{
int fd;
void *addr;
long fsize;
long msize;
struct hints_header *hdr;
struct hints_bucket *blist;
char *strtab;
struct shlib_list *shp;
int i;
if ((fd = open(hints_file, O_RDONLY, 0)) == -1) {
warn("%s", hints_file);
return -1;
}
msize = PAGE_SIZE;
addr = mmap(0, msize, PROT_READ, MAP_PRIVATE, fd, 0);
if (addr == MAP_FAILED) {
warn("%s", hints_file);
return -1;
}
hdr = (struct hints_header *)addr;
if (HH_BADMAG(*hdr)) {
warnx("%s: bad magic: %lo", hints_file,
(unsigned long)hdr->hh_magic);
return -1;
}
if (hdr->hh_version != LD_HINTS_VERSION_1 &&
hdr->hh_version != LD_HINTS_VERSION_2) {
warnx("unsupported version: %ld", (long)hdr->hh_version);
return -1;
}
if (hdr->hh_ehints > msize) {
fsize = hdr->hh_ehints;
munmap(addr, msize);
addr = mmap(0, fsize, PROT_READ, MAP_PRIVATE, fd, 0);
if (addr == MAP_FAILED) {
warn("%s", hints_file);
return -1;
}
hdr = (struct hints_header *)addr;
}
close(fd);
strtab = (char *)addr + hdr->hh_strtab;
if (hdr->hh_version >= LD_HINTS_VERSION_2)
add_search_path(strtab + hdr->hh_dirlist);
else if (rescan)
errx(1, "%s too old and does not contain the search path",
hints_file);
if (rescan)
return 0;
blist = malloc(sizeof(*blist) * hdr->hh_nbucket);
if (blist == NULL)
err(1, "readhints");
memcpy(blist, (char *)addr + hdr->hh_hashtab,
sizeof(*blist) * hdr->hh_nbucket);
for (i = 0; i < hdr->hh_nbucket; i++) {
struct hints_bucket *bp = &blist[i];
/* Sanity check */
if (bp->hi_namex >= hdr->hh_strtab_sz) {
warnx("bad name index: %#x", bp->hi_namex);
free(blist);
return -1;
}
if (bp->hi_pathx >= hdr->hh_strtab_sz) {
warnx("bad path index: %#x", bp->hi_pathx);
free(blist);
return -1;
}
/* Allocate new list element */
shp = (struct shlib_list *)xmalloc(sizeof *shp);
shp->name = strdup(strtab + bp->hi_namex);
shp->path = strdup(strtab + bp->hi_pathx);
bcopy(bp->hi_dewey, shp->dewey, sizeof(shp->dewey));
shp->ndewey = bp->hi_ndewey;
shp->next = NULL;
*shlib_tail = shp;
shlib_tail = &shp->next;
}
free(blist);
return 0;
}
static void
listhints(void)
{
struct shlib_list *shp;
int i;
printf("%s:\n", hints_file);
printf("\tsearch directories: %s\n", dir_list);
for (i = 0, shp = shlib_head; shp; i++, shp = shp->next)
printf("\t%d:-l%s.%d.%d => %s\n",
i, shp->name, shp->major, shp->minor, shp->path);
return;
}