rtld: Use uintptr_t instead of Elf_Addr for init/fini function pointers
ClosedPublic
Actions

Authored by jhb on Wed, Jan 14, 3:30 PM.

Details

Reviewers

kib
jrtc27
imp

Group Reviewers

cheri

Commits

rGe96ec1a1eb93: rtld: Use uintptr_t instead of Elf_Addr for init/fini function pointers

Summary

This is a no-op on non-CHERI architectures, but is required for CHERI
where Elf_Addr is only an address and not a complete pointer.

While here, consistently use uintptr_t * for arrays of init/fini
function pointers.

Effort: CHERI upstreaming
Obtained from: CheriBSD
Sponsored by: AFRL, DARPA

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

jhb created this revision.Wed, Jan 14, 3:30 PM

Herald added subscribers: bdragon, imp. · View Herald TranscriptWed, Jan 14, 3:30 PM

jhb requested review of this revision.Wed, Jan 14, 3:30 PM

Herald added a reviewer: cheri. · View Herald TranscriptWed, Jan 14, 3:30 PM

jhb added a parent revision: D54710: rtld: Simplify walking program headers.Wed, Jan 14, 3:30 PM

jhb added a child revision: D54712: rtld: Switch to using <assert.h> for assert.

Harbormaster completed remote builds in B69877: Diff 169703.Wed, Jan 14, 3:30 PM

This is a nice cleanup and eliminates a void * -> void ** type smearing we had with ElfAddr and should be a nop if I read right.

This revision is now accepted and ready to land.Wed, Jan 14, 3:36 PM

kib accepted this revision.Wed, Jan 14, 3:56 PM

Closed by commit rGe96ec1a1eb93: rtld: Use uintptr_t instead of Elf_Addr for init/fini function pointers (authored by jhb). · Explain WhyWed, Jan 14, 5:12 PM

This revision was automatically updated to reflect the committed changes.

jhb added a commit: rGe96ec1a1eb93: rtld: Use uintptr_t instead of Elf_Addr for init/fini function pointers.

Revision Contents
Changeset List

Path

Size

libexec/

rtld-elf/

rtld.h

10 lines

rtld.c

42 lines

Diff 169719

View Options

libexec/rtld-elf/rtld.h