From: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
To: Vaibhav Jain <vaibhav@linux.ibm.com>,
linuxppc-dev@lists.ozlabs.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: nramas@linux.microsoft.com, Rob Herring <robh@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Mimi Zohar <zohar@linux.ibm.com>,
Prakhar Srivastava <prsriva@linux.microsoft.com>
Subject: Re: [PATCH] powerpc: check previous kernel's ima-kexec-buffer against memory bounds
Date: Wed, 18 May 2022 13:30:49 -0700 [thread overview]
Message-ID: <83e757fe-5269-693b-ee8c-c5186ea5fcdd@linux.microsoft.com> (raw)
In-Reply-To: <20220518200547.655788-1-vaibhav@linux.ibm.com>
Hi Vaibhav,
On 5/18/2022 1:05 PM, Vaibhav Jain wrote:
> Presently ima_get_kexec_buffer() doesn't check if the previous kernel's
> ima-kexec-buffer lies outside the addressable memory range. This can result
> in a kernel panic if the new kernel is booted with 'mem=X' arg and the
> ima-kexec-buffer was allocated beyond that range by the previous kernel.
Thanks for providing this patch.
> Fix this issue by checking returned address/size of previous kernel's
> ima-kexec-buffer against memblock's memory bounds.
>
> Fixes: fee3ff99bc67("powerpc: Move arch independent ima kexec functions to
> drivers/of/kexec.c")
>
> Cc: Frank Rowand <frowand.list@gmail.com>
> Cc: Prakhar Srivastava <prsriva@linux.microsoft.com>
> Cc: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
> Cc: Thiago Jung Bauermann <bauerman@linux.ibm.com>
> Cc: Rob Herring <robh@kernel.org>
> Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com>
> ---
> drivers/of/kexec.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c
> index b9bd1cff1793..c73007eda52d 100644
> --- a/drivers/of/kexec.c
> +++ b/drivers/of/kexec.c
> @@ -140,6 +140,13 @@ int ima_get_kexec_buffer(void **addr, size_t *size)
> if (ret)
> return ret;
>
> + /* if the ima-kexec-buffer goes beyond the addressable memory */
> + if (!memblock_is_region_memory(tmp_addr, tmp_size)) {
> + pr_warn("IMA buffer at 0x%lx, size = 0x%zx beyond memory\n",
> + tmp_addr, tmp_size);
> + return -EINVAL;
> + }
> +
Reviewed-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
> *addr = __va(tmp_addr);
> *size = tmp_size;
>
WARNING: multiple messages have this Message-ID (diff)
From: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
To: Vaibhav Jain <vaibhav@linux.ibm.com>,
linuxppc-dev@lists.ozlabs.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Frank Rowand <frowand.list@gmail.com>,
Prakhar Srivastava <prsriva@linux.microsoft.com>,
Rob Herring <robh@kernel.org>, Mimi Zohar <zohar@linux.ibm.com>,
nramas@linux.microsoft.com
Subject: Re: [PATCH] powerpc: check previous kernel's ima-kexec-buffer against memory bounds
Date: Wed, 18 May 2022 13:30:49 -0700 [thread overview]
Message-ID: <83e757fe-5269-693b-ee8c-c5186ea5fcdd@linux.microsoft.com> (raw)
In-Reply-To: <20220518200547.655788-1-vaibhav@linux.ibm.com>
Hi Vaibhav,
On 5/18/2022 1:05 PM, Vaibhav Jain wrote:
> Presently ima_get_kexec_buffer() doesn't check if the previous kernel's
> ima-kexec-buffer lies outside the addressable memory range. This can result
> in a kernel panic if the new kernel is booted with 'mem=X' arg and the
> ima-kexec-buffer was allocated beyond that range by the previous kernel.
Thanks for providing this patch.
> Fix this issue by checking returned address/size of previous kernel's
> ima-kexec-buffer against memblock's memory bounds.
>
> Fixes: fee3ff99bc67("powerpc: Move arch independent ima kexec functions to
> drivers/of/kexec.c")
>
> Cc: Frank Rowand <frowand.list@gmail.com>
> Cc: Prakhar Srivastava <prsriva@linux.microsoft.com>
> Cc: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
> Cc: Thiago Jung Bauermann <bauerman@linux.ibm.com>
> Cc: Rob Herring <robh@kernel.org>
> Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com>
> ---
> drivers/of/kexec.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c
> index b9bd1cff1793..c73007eda52d 100644
> --- a/drivers/of/kexec.c
> +++ b/drivers/of/kexec.c
> @@ -140,6 +140,13 @@ int ima_get_kexec_buffer(void **addr, size_t *size)
> if (ret)
> return ret;
>
> + /* if the ima-kexec-buffer goes beyond the addressable memory */
> + if (!memblock_is_region_memory(tmp_addr, tmp_size)) {
> + pr_warn("IMA buffer at 0x%lx, size = 0x%zx beyond memory\n",
> + tmp_addr, tmp_size);
> + return -EINVAL;
> + }
> +
Reviewed-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
> *addr = __va(tmp_addr);
> *size = tmp_size;
>
next prev parent reply other threads:[~2022-05-18 20:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-18 20:05 [PATCH] powerpc: check previous kernel's ima-kexec-buffer against memory bounds Vaibhav Jain
2022-05-18 20:05 ` Vaibhav Jain
2022-05-18 20:30 ` Lakshmi Ramasubramanian [this message]
2022-05-18 20:30 ` Lakshmi Ramasubramanian
2022-05-20 10:55 ` Michael Ellerman
2022-05-20 10:55 ` Michael Ellerman
2022-05-20 22:30 ` Rob Herring
2022-05-20 22:30 ` Rob Herring
2022-05-22 22:51 ` Vaibhav Jain
2022-05-23 4:30 ` Michael Ellerman
2022-05-24 5:57 ` Vaibhav Jain
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=83e757fe-5269-693b-ee8c-c5186ea5fcdd@linux.microsoft.com \
--to=nramas@linux.microsoft.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=prsriva@linux.microsoft.com \
--cc=robh@kernel.org \
--cc=vaibhav@linux.ibm.com \
--cc=zohar@linux.ibm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.