devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rob Herring <robh@kernel.org>
To: Rik van Riel <riel@surriel.com>
Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com,
	Frank Rowand <frowand.list@gmail.com>,
	devicetree@vger.kernel.org
Subject: Re: [PATCH] mm,ima,kexec,of: use memblock_free_late from ima_free_kexec_buffer
Date: Fri, 18 Aug 2023 12:09:29 -0500	[thread overview]
Message-ID: <20230818170929.GA151785-robh@kernel.org> (raw)
In-Reply-To: <20230817135759.0888e5ef@imladris.surriel.com>

On Thu, Aug 17, 2023 at 01:57:59PM -0400, Rik van Riel wrote:
> The code calling ima_free_kexec_buffer runs long after the memblock
> allocator has already been torn down, potentially resulting in a use
> after free in memblock_isolate_range.
> 
> With KASAN or KFENCE, this use after free will result in a BUG
> from the idle task, and a subsequent kernel panic.
> 
> Switch ima_free_kexec_buffer over to memblock_free_late to avoid
> that issue.
> 
> Fixes: fee3ff99bc67 ("powerpc: Move arch independent ima kexec functions to
> drivers/of/kexec.c")

Didn't powerpc have the same issue before this commit? The move changed 
memblock_free() to memblock_phys_free(), but otherwise the code was the 
same. But wait, the old code looks broken as it reads a phys addr from 
DT and passes that to memblock_free() which wants a virt addr. Probably 
should have fixed that before moving things. I guess the Fixes here is 
right and powerpc needs a different backport for before commit 
fee3ff99bc67 if they care.

> Cc: stable@kernel.org
> Signed-off-by: Rik van Riel <riel@surriel.com>
> Suggested-by: Mike Rappoport <rppt@kernel.org>
> ---
>  drivers/of/kexec.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c
> index f26d2ba8a371..68278340cecf 100644
> --- a/drivers/of/kexec.c
> +++ b/drivers/of/kexec.c
> @@ -184,7 +184,8 @@ int __init ima_free_kexec_buffer(void)
>  	if (ret)
>  		return ret;
>  
> -	return memblock_phys_free(addr, size);
> +	memblock_free_late(addr, size);
> +	return 0;
>  }
>  #endif
>  
> -- 
> 2.41.0
> 

      parent reply	other threads:[~2023-08-18 17:10 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-17 17:57 [PATCH] mm,ima,kexec,of: use memblock_free_late from ima_free_kexec_buffer Rik van Riel
2023-08-18 16:47 ` Rob Herring
2023-08-18 17:09 ` Rob Herring [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230818170929.GA151785-robh@kernel.org \
    --to=robh@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=frowand.list@gmail.com \
    --cc=kernel-team@meta.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=riel@surriel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).