From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id D9778C433F5
	for <linux-kernel@archiver.kernel.org>; Tue, 25 Jan 2022 15:53:35 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1582663AbiAYPwt (ORCPT
        <rfc822;linux-kernel@archiver.kernel.org>);
        Tue, 25 Jan 2022 10:52:49 -0500
Received: from foss.arm.com ([217.140.110.172]:51900 "EHLO foss.arm.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1582582AbiAYPuM (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 25 Jan 2022 10:50:12 -0500
Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14])
        by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2F1C9D6E;
        Tue, 25 Jan 2022 07:50:08 -0800 (PST)
Received: from FVFF77S0Q05N (unknown [10.57.1.45])
        by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BCC023F793;
        Tue, 25 Jan 2022 07:50:06 -0800 (PST)
Date:   Tue, 25 Jan 2022 15:50:01 +0000
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.
Message-ID: <YfAcKZpDWmKMZy8q@FVFF77S0Q05N>
References: <20220122023447.1480995-1-eugenis@google.com>
 <YfAV6FTN5g6jZGj7@FVFF77S0Q05N>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <YfAV6FTN5g6jZGj7@FVFF77S0Q05N>
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Jan 25, 2022 at 03:23:20PM +0000, Mark Rutland wrote:
> 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>

Looking again, sicne this isn't jsut a null-deref, can we also rework the
title, something like:

| arm64: extable: fix load_unaligned_zeropad() reg indices

Thanks,
Mark.