linux-kernel - Re: [PATCH] efi: sysfb_efi: fix build when EFI is not set

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAMj1kXE--e+XYVMR=i0_hWQ8TZD7a+OshxsuHbbAf6UZwH4=XA@mail.gmail.com>
Date:   Tue, 27 Jul 2021 09:05:55 +0200
From:   Ard Biesheuvel <ardb@...nel.org>
To:     Randy Dunlap <rdunlap@...radead.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        linux-efi <linux-efi@...r.kernel.org>,
        dri-devel <dri-devel@...ts.freedesktop.org>,
        Javier Martinez Canillas <javierm@...hat.com>,
        Thomas Zimmermann <tzimmermann@...e.de>,
        Mark Brown <broonie@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: [PATCH] efi: sysfb_efi: fix build when EFI is not set

On Tue, 27 Jul 2021 at 07:05, Randy Dunlap <rdunlap@...radead.org> wrote:
>
> When # CONFIG_EFI is not set, there are 2 definitions of
> sysfb_apply_efi_quirks(). The stub from sysfb.h should be used
> and the __init function from sysfb_efi.c should not be used.
>
> ../drivers/firmware/efi/sysfb_efi.c:337:13: error: redefinition of ‘sysfb_apply_efi_quirks’
>  __init void sysfb_apply_efi_quirks(struct platform_device *pd)
>              ^~~~~~~~~~~~~~~~~~~~~~
> In file included from ../drivers/firmware/efi/sysfb_efi.c:26:0:
> ../include/linux/sysfb.h:65:20: note: previous definition of ‘sysfb_apply_efi_quirks’ was here
>  static inline void sysfb_apply_efi_quirks(struct platform_device *pd)
>                     ^~~~~~~~~~~~~~~~~~~~~~
>
> Signed-off-by: Randy Dunlap <rdunlap@...radead.org>
> Cc: Ard Biesheuvel <ardb@...nel.org>
> Cc: linux-efi@...r.kernel.org
> Cc: dri-devel@...ts.freedesktop.org
> Cc: Javier Martinez Canillas <javierm@...hat.com>
> Cc: Thomas Zimmermann <tzimmermann@...e.de>
> Cc: Mark Brown <broonie@...nel.org>
> Cc: linux-next@...r.kernel.org

Acked-by: Ard Biesheuvel <ardb@...nel.org>

> ---
>  drivers/firmware/efi/sysfb_efi.c |    2 ++
>  1 file changed, 2 insertions(+)
>
> --- linext-20210726.orig/drivers/firmware/efi/sysfb_efi.c
> +++ linext-20210726/drivers/firmware/efi/sysfb_efi.c
> @@ -332,6 +332,7 @@ static const struct fwnode_operations ef
>         .add_links = efifb_add_links,
>  };
>
> +#ifdef CONFIG_EFI
>  static struct fwnode_handle efifb_fwnode;
>
>  __init void sysfb_apply_efi_quirks(struct platform_device *pd)
> @@ -354,3 +355,4 @@ __init void sysfb_apply_efi_quirks(struc
>                 pd->dev.fwnode = &efifb_fwnode;
>         }
>  }
> +#endif