From: Mark Rutland <mark.rutland@arm.com>
To: Evgenii Stepanov <eugenis@google.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Jisheng Zhang <jszhang@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] arm64: extable: fix null deref in load_unaligned_zeropad.
Date: Tue, 25 Jan 2022 15:23:20 +0000 [thread overview]
Message-ID: <YfAV6FTN5g6jZGj7@FVFF77S0Q05N> (raw)
In-Reply-To: <20220122023447.1480995-1-eugenis@google.com>
On Fri, Jan 21, 2022 at 06:34:47PM -0800, Evgenii Stepanov wrote:
> ex_handler_load_unaligned_zeropad extracts the source and data register
> numbers from the wrong field of the exception table.
Ouch. Did you find this by inspection, or did this show up in testing?
Sorry about this.
I think we should be a little more explicit as to exactly what goes wrong. How
about:
| In ex_handler_load_unaligned_zeropad() we erroneously extract the data and
| addr register indices from ex->type rather than ex->data. As ex->type will
| contain EX_TYPE_LOAD_UNALIGNED_ZEROPAD (i.e. 4):
|
| * We'll always treat X0 as the address register, since EX_DATA_REG_ADDR is
| extracted from bits [9:5]. Thus, we may attempt to dereference an arbitrary
| address as X0 may hold an arbitary value.
|
| * We'll always treat X4 as the data register, since EX_DATA_REG_DATA is
| extracted from bits [4:0]. Thus we will corrupt X4 and cause arbitrary
| behaviour within load_unaligned_zeropad() and its caller.
|
| Fix this by extracting both values from ex->data as originally intended.
> Fixes: 753b3236
That should be expanded, e.g.
Fixes: 753b32368705c396 ("arm64: extable: add load_unaligned_zeropad() handler")
With those changes:
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Thanks,
Mark.
> Signed-off-by: Evgenii Stepanov <eugenis@google.com>
> ---
> arch/arm64/mm/extable.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/mm/extable.c b/arch/arm64/mm/extable.c
> index c0181e60cc98..489455309695 100644
> --- a/arch/arm64/mm/extable.c
> +++ b/arch/arm64/mm/extable.c
> @@ -40,8 +40,8 @@ static bool
> ex_handler_load_unaligned_zeropad(const struct exception_table_entry *ex,
> struct pt_regs *regs)
> {
> - int reg_data = FIELD_GET(EX_DATA_REG_DATA, ex->type);
> - int reg_addr = FIELD_GET(EX_DATA_REG_ADDR, ex->type);
> + int reg_data = FIELD_GET(EX_DATA_REG_DATA, ex->data);
> + int reg_addr = FIELD_GET(EX_DATA_REG_ADDR, ex->data);
> unsigned long data, addr, offset;
>
> addr = pt_regs_read_reg(regs, reg_addr);
> --
> 2.35.0.rc0.227.g00780c9af4-goog
>
next prev parent reply other threads:[~2022-01-25 15:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-22 2:34 [PATCH] arm64: extable: fix null deref in load_unaligned_zeropad Evgenii Stepanov
2022-01-24 9:56 ` Catalin Marinas
2022-01-25 15:23 ` Mark Rutland [this message]
2022-01-25 15:50 ` Mark Rutland
2022-01-25 16:59 ` Evgenii Stepanov
2022-01-25 17:07 ` Mark Rutland
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=YfAV6FTN5g6jZGj7@FVFF77S0Q05N \
--to=mark.rutland@arm.com \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=eugenis@google.com \
--cc=jszhang@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
/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).