mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-28 08:44:29 -04:00
binfmt_elf: consume a stashed PT_INTERP substitute
When a binfmt_misc loader entry stashed bprm->loader use it instead of opening the path named in PT_INTERP. The substitution deliberately changes as little as possible. Ownership transfers into the local interpreter reference which the existing success and error paths already release. A binary without PT_INTERP has nothing to substitute for. Drop the override at the end of the segment scan and load the binary natively. Nothing sets bprm->loader yet. Link: https://patch.msgid.link/20260721-work-bpf-binfmt_misc-ptinterp-v2-16-e57866e4ae0f@kernel.org Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
This commit is contained in:
@@ -901,7 +901,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
|
||||
if (elf_interpreter[elf_ppnt->p_filesz - 1] != '\0')
|
||||
goto out_free_interp;
|
||||
|
||||
interpreter = open_exec(elf_interpreter);
|
||||
interpreter = bprm_open_interpreter(bprm, elf_interpreter);
|
||||
kfree(elf_interpreter);
|
||||
retval = PTR_ERR(interpreter);
|
||||
if (IS_ERR(interpreter))
|
||||
@@ -932,6 +932,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
|
||||
goto out_free_ph;
|
||||
}
|
||||
|
||||
/* No PT_INTERP to substitute for: the override does not apply. */
|
||||
bprm_drop_loader(bprm);
|
||||
|
||||
elf_ppnt = elf_phdata;
|
||||
for (i = 0; i < elf_ex->e_phnum; i++, elf_ppnt++)
|
||||
switch (elf_ppnt->p_type) {
|
||||
|
||||
Reference in New Issue
Block a user