Re: [PATCH v2 07/22] dl: provide a fake grub_dl_set_persistent for the emu target

[Stefan Berger]

On 6/30/21 4:40 AM, Daniel Axtens wrote:
> Trying to start grub-emu with a module that calls grub_dl_set_persistent
> will crash because grub-emu fakes modules and passes NULL to the module
> init function.
>
> Provide an empty function for the emu case.
>
> Fixes: ee7808e2197c (dl: Add support for persistent modules)
> Signed-off-by: Daniel Axtens <dja@axtens.net>

Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>


> ---
>   include/grub/dl.h | 11 +++++++++++
>   1 file changed, 11 insertions(+)
>
> diff --git a/include/grub/dl.h b/include/grub/dl.h
> index b3753c9ca262..5decbe2f2fb9 100644
> --- a/include/grub/dl.h
> +++ b/include/grub/dl.h
> @@ -243,11 +243,22 @@ grub_dl_get (const char *name)
>     return 0;
>   }
>   
> +#ifdef GRUB_MACHINE_EMU
> +/*
> + * Under grub-emu, modules are faked and NULL is passed to GRUB_MOD_INIT.
> + * So we fake this out to avoid a NULL deref.
> + */
> +static inline void
> +grub_dl_set_persistent (grub_dl_t mod __attribute__((unused)))
> +{
> +}
> +#else
>   static inline void
>   grub_dl_set_persistent (grub_dl_t mod)
>   {
>     mod->persistent = 1;
>   }
> +#endif
>   
>   static inline int
>   grub_dl_is_persistent (grub_dl_t mod)