[GIT PULL 0/2] EFI updates for v4.15

[GIT PULL 0/2] EFI updates for v4.15

[Ard Biesheuvel]

The following changes since commit 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f:

  Linux 4.14-rc4 (2017-10-08 20:53:29 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-next

for you to fetch changes up to c19611def8fd3f524bc945f0e8f9becace8fdf06:

  arm64: efi: ignore EFI_MEMORY_XP attribute if RP and/or WP are set (2017-10-16 16:21:26 +0100)

----------------------------------------------------------------
EFI changes for v4.15:
- ignore EFI_MEMORY_XP attributes on ARM if _RP/_WP are set as well
- a cosmetic pr_err() format string fix

----------------------------------------------------------------
Ard Biesheuvel (1):
      arm64: efi: ignore EFI_MEMORY_XP attribute if RP and/or WP are set

Arvind Yadav (1):
      efi/capsule-loader: pr_err() strings should end with newlines

 arch/arm64/kernel/efi.c               | 4 +++-
 drivers/firmware/efi/capsule-loader.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

[PATCH 1/2] efi/capsule-loader: pr_err() strings should end with newlines

[Ard Biesheuvel]

From: Arvind Yadav <arvind.yadav.cs@gmail.com>

pr_err() messages should terminated with a new-line to avoid
other messages being concatenated onto the end.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Kweh Hock Leong <hock.leong.kweh@intel.com>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 drivers/firmware/efi/capsule-loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c
index ec8ac5c4dd84..51d2874942a2 100644
--- a/drivers/firmware/efi/capsule-loader.c
+++ b/drivers/firmware/efi/capsule-loader.c
@@ -49,7 +49,7 @@ int __efi_capsule_setup_info(struct capsule_info *cap_info)
 	pages_needed = ALIGN(cap_info->total_size, PAGE_SIZE) / PAGE_SIZE;
 
 	if (pages_needed == 0) {
-		pr_err("invalid capsule size");
+		pr_err("invalid capsule size\n");
 		return -EINVAL;
 	}
 
-- 
2.11.0

[PATCH 2/2] arm64: efi: ignore EFI_MEMORY_XP attribute if RP and/or WP are set

[Ard Biesheuvel]

The UEFI memory map is a bit vague about how to interpret the
EFI_MEMORY_XP attribute when it is combined with EFI_MEMORY_RP and/or
EFI_MEMORY_WP, which have retroactively been redefined as cacheability
attributes rather than permission attributes.

So let's ignore EFI_MEMORY_XP if _RP and/or _WP are also set. In this
case, it is likely that they are being used to describe the capability
of the region (i.e., whether it has the controls to reconfigure it as
non-executable) rather than the nature of the contents of the region
(i.e., whether it contains data that we will never attempt to execute)

Reported-by: Stephen Boyd <sboyd@codeaurora.org>
Tested-by: Stephen Boyd <sboyd@codeaurora.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 arch/arm64/kernel/efi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
index 82cd07592519..f85ac58d08a3 100644
--- a/arch/arm64/kernel/efi.c
+++ b/arch/arm64/kernel/efi.c
@@ -48,7 +48,9 @@ static __init pteval_t create_mapping_protection(efi_memory_desc_t *md)
 		return pgprot_val(PAGE_KERNEL_ROX);
 
 	/* RW- */
-	if (attr & EFI_MEMORY_XP || type != EFI_RUNTIME_SERVICES_CODE)
+	if (((attr & (EFI_MEMORY_RP | EFI_MEMORY_WP | EFI_MEMORY_XP)) ==
+	     EFI_MEMORY_XP) ||
+	    type != EFI_RUNTIME_SERVICES_CODE)
 		return pgprot_val(PAGE_KERNEL);
 
 	/* RWX */
-- 
2.11.0

Re: [GIT PULL 0/2] EFI updates for v4.15

[Ard Biesheuvel]

On 25 October 2017 at 11:14, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> The following changes since commit 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f:
>
>   Linux 4.14-rc4 (2017-10-08 20:53:29 -0700)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-next
>
> for you to fetch changes up to c19611def8fd3f524bc945f0e8f9becace8fdf06:
>
>   arm64: efi: ignore EFI_MEMORY_XP attribute if RP and/or WP are set (2017-10-16 16:21:26 +0100)
>
> ----------------------------------------------------------------
> EFI changes for v4.15:
> - ignore EFI_MEMORY_XP attributes on ARM if _RP/_WP are set as well
> - a cosmetic pr_err() format string fix
>
> ----------------------------------------------------------------
> Ard Biesheuvel (1):
>       arm64: efi: ignore EFI_MEMORY_XP attribute if RP and/or WP are set
>
> Arvind Yadav (1):
>       efi/capsule-loader: pr_err() strings should end with newlines
>
>  arch/arm64/kernel/efi.c               | 4 +++-
>  drivers/firmware/efi/capsule-loader.c | 2 +-
>  2 files changed, 4 insertions(+), 2 deletions(-)

Ingo,

It appears these patches have never made it into the TIP tree. Shall I
just resend them as part of the pull request for v4.16?

Thanks,
Ard.

Re: [GIT PULL 0/2] EFI updates for v4.15

[Ingo Molnar]

* Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote:

> On 25 October 2017 at 11:14, Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote:
> > The following changes since commit 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f:
> >
> >   Linux 4.14-rc4 (2017-10-08 20:53:29 -0700)
> >
> > are available in the git repository at:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-next
> >
> > for you to fetch changes up to c19611def8fd3f524bc945f0e8f9becace8fdf06:
> >
> >   arm64: efi: ignore EFI_MEMORY_XP attribute if RP and/or WP are set (2017-10-16 16:21:26 +0100)
> >
> > ----------------------------------------------------------------
> > EFI changes for v4.15:
> > - ignore EFI_MEMORY_XP attributes on ARM if _RP/_WP are set as well
> > - a cosmetic pr_err() format string fix
> >
> > ----------------------------------------------------------------
> > Ard Biesheuvel (1):
> >       arm64: efi: ignore EFI_MEMORY_XP attribute if RP and/or WP are set
> >
> > Arvind Yadav (1):
> >       efi/capsule-loader: pr_err() strings should end with newlines
> >
> >  arch/arm64/kernel/efi.c               | 4 +++-
> >  drivers/firmware/efi/capsule-loader.c | 2 +-
> >  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> Ingo,
> 
> It appears these patches have never made it into the TIP tree. Shall I
> just resend them as part of the pull request for v4.16?

Indeed - my mistake ...

Feel free to send them as efi/urgent material, or as v4.16 bits.

Thanks,

	Ingo

Re: [GIT PULL 0/2] EFI updates for v4.15

[Ard Biesheuvel]

On 27 December 2017 at 18:46, Ingo Molnar <mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:
>
> * Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote:
>
>> On 25 October 2017 at 11:14, Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote:
>> > The following changes since commit 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f:
>> >
>> >   Linux 4.14-rc4 (2017-10-08 20:53:29 -0700)
>> >
>> > are available in the git repository at:
>> >
>> >   git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-next
>> >
>> > for you to fetch changes up to c19611def8fd3f524bc945f0e8f9becace8fdf06:
>> >
>> >   arm64: efi: ignore EFI_MEMORY_XP attribute if RP and/or WP are set (2017-10-16 16:21:26 +0100)
>> >
>> > ----------------------------------------------------------------
>> > EFI changes for v4.15:
>> > - ignore EFI_MEMORY_XP attributes on ARM if _RP/_WP are set as well
>> > - a cosmetic pr_err() format string fix
>> >
>> > ----------------------------------------------------------------
>> > Ard Biesheuvel (1):
>> >       arm64: efi: ignore EFI_MEMORY_XP attribute if RP and/or WP are set
>> >
>> > Arvind Yadav (1):
>> >       efi/capsule-loader: pr_err() strings should end with newlines
>> >
>> >  arch/arm64/kernel/efi.c               | 4 +++-
>> >  drivers/firmware/efi/capsule-loader.c | 2 +-
>> >  2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> Ingo,
>>
>> It appears these patches have never made it into the TIP tree. Shall I
>> just resend them as part of the pull request for v4.16?
>
> Indeed - my mistake ...
>
> Feel free to send them as efi/urgent material, or as v4.16 bits.
>

Thanks - I will just add them to the v4.16 queue.