[PATCH v2 08/21] elf: create elf_open_binary_into()
Ahmad Fatoum
a.fatoum at pengutronix.de
Tue Jan 6 05:55:05 PST 2026
Hi,
On 1/6/26 1:53 PM, Sascha Hauer wrote:
> elf_open_binary() returns a dynamically allocated struct elf_image *. We
> do not have malloc in the PBL, so for better PBL support create
> elf_open_binary_into() which takes a struct elf_image * as argument.
>
> Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
> Co-Authored-By: Claude Sonnet 4.5 <noreply at anthropic.com>
Reviewed-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
Thanks,
Ahmad
> ---
> common/elf.c | 26 +++++++++++++++++++-------
> include/elf.h | 1 +
> 2 files changed, 20 insertions(+), 7 deletions(-)
>
> diff --git a/common/elf.c b/common/elf.c
> index b3cc9b59644aa6e6e029fa44988dbdc0787c42f6..d51c99192f327abc0eb4ca68109bc88c6a451d94 100644
> --- a/common/elf.c
> +++ b/common/elf.c
> @@ -318,6 +318,23 @@ static void elf_init_struct(struct elf_image *elf)
> elf->filename = NULL;
> }
>
> +int elf_open_binary_into(struct elf_image *elf, void *buf)
> +{
> + int ret;
> +
> + memset(elf, 0, sizeof(*elf));
> + elf_init_struct(elf);
> +
> + elf->hdr_buf = buf;
> + ret = elf_check_image(elf, buf);
> + if (ret)
> + return ret;
> +
> + elf->entry = elf_hdr_e_entry(elf, elf->hdr_buf);
> +
> + return 0;
> +}
> +
> struct elf_image *elf_open_binary(void *buf)
> {
> int ret;
> @@ -327,17 +344,12 @@ struct elf_image *elf_open_binary(void *buf)
> if (!elf)
> return ERR_PTR(-ENOMEM);
>
> - elf_init_struct(elf);
> -
> - elf->hdr_buf = buf;
> - ret = elf_check_image(elf, buf);
> + ret = elf_open_binary_into(elf, buf);
> if (ret) {
> free(elf);
> - return ERR_PTR(-EINVAL);
> + return ERR_PTR(ret);
> }
>
> - elf->entry = elf_hdr_e_entry(elf, elf->hdr_buf);
> -
> return elf;
> }
>
> diff --git a/include/elf.h b/include/elf.h
> index 84b98553cff69257f8c2fbfb2e7504a4400e0f53..64574cb4836cd67f54538ad1621d7fc5fbf58f92 100644
> --- a/include/elf.h
> +++ b/include/elf.h
> @@ -410,6 +410,7 @@ static inline size_t elf_get_mem_size(struct elf_image *elf)
> return elf->high_addr - elf->low_addr;
> }
>
> +int elf_open_binary_into(struct elf_image *elf, void *buf);
> struct elf_image *elf_open_binary(void *buf);
> struct elf_image *elf_open(const char *filename);
> void elf_close(struct elf_image *elf);
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
More information about the barebox
mailing list