imgact_elf.c: unify check for phdr fitting into the first page
ClosedPublic
Actions

Authored by kib on Sep 5 2020, 7:05 PM.

Details

Reviewers

emaste
dim

Commits

rS365433: imgact_elf.c: unify check for phdr fitting into the first page.

Summary

Similar to the userspace rtld check.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 33415

Event Timeline

kib created this revision.Sep 5 2020, 7:05 PM

Herald added a subscriber: imp. · View Herald TranscriptSep 5 2020, 7:05 PM

kib requested review of this revision.Sep 5 2020, 7:05 PM

Harbormaster completed remote builds in B33414: Diff 76694.Sep 5 2020, 7:05 PM

LGTM, nice catch!

This revision is now accepted and ready to land.Sep 5 2020, 7:16 PM

emaste added inline comments.Sep 5 2020, 7:18 PM

sys/kern/imgact_elf.c
455	hrm, actually shouldn't this be `<= PAGE_SIZE - hdr->e_phoff)`

Unfix off by one.

P.S. Then rtld-elf/map_object.c needs to be unfixed as well.

This revision now requires review to proceed.Sep 5 2020, 8:56 PM

Harbormaster completed remote builds in B33415: Diff 76700.Sep 5 2020, 8:56 PM

P.S. Then rtld-elf/map_object.c needs to be unfixed as well.

Yes, in that review I thought it was fixing an off-by-one, but now that I look at it again here I think it's correct this way (now).

dim accepted this revision.Sep 7 2020, 7:06 PM

This revision is now accepted and ready to land.Sep 7 2020, 7:06 PM

emaste accepted this revision.Sep 7 2020, 7:18 PM

Closed by commit rS365433: imgact_elf.c: unify check for phdr fitting into the first page. (authored by kib). · Explain WhySep 7 2020, 9:37 PM

This revision was automatically updated to reflect the committed changes.

kib added a commit: rS365433: imgact_elf.c: unify check for phdr fitting into the first page..

Revision Contents
Changeset List

Path

Size

sys/

kern/

imgact_elf.c

14 lines

Diff 76700

View Options

imgact_elf.c: unify check for phdr fitting into the first pageClosedPublicActions