From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3801EC2D0CE for ; Fri, 24 Jan 2020 09:34:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00BA8208C4 for ; Fri, 24 Jan 2020 09:34:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858451; bh=iROWKBdG0i9Uzw7teC7DQ+rsN5didNdgV94XLJ/+7+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yo6qdYCc1ueMRw+7sx7OLAFjSUJDGq+Ccen9Gpq34KU556798JqO6GZ5RkSmaKQz+ bxq65mIoMIaRKJxzlwgkYXDdIGnKCbZdNpuAQnAfdgvAi7kO+cefMs6y9shlqAC7Pp 3YTMmGE9Erz07aK+UIHBm8MXJJQfuUtYBUTzp8Q8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729921AbgAXJeK (ORCPT ); Fri, 24 Jan 2020 04:34:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:60806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729384AbgAXJeK (ORCPT ); Fri, 24 Jan 2020 04:34:10 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8F47B24125; Fri, 24 Jan 2020 09:34:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858449; bh=iROWKBdG0i9Uzw7teC7DQ+rsN5didNdgV94XLJ/+7+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i/hgiwuda9gtT0ewVUj0FAZPrqheItb9eIGpyJqWSXxpeLvM4UJkjS9F7eQFt0tyi W45zGGTwvSrdO9W2DzSbUnx2AfdMFRmBmVaLWropGPwhrTOckp9SDG5XP+Neuo43Z+ +fh4AwH0BT+654gzBFBn0SkZzU3xGLzvQqu7WX1M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lexi Shao , Christophe Leroy , Michael Ellerman Subject: [PATCH 5.4 021/102] powerpc/kasan: Fix boot failure with RELOCATABLE && FSL_BOOKE Date: Fri, 24 Jan 2020 10:30:22 +0100 Message-Id: <20200124092809.370962296@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092806.004582306@linuxfoundation.org> References: <20200124092806.004582306@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Christophe Leroy commit 71eb40fc53371bc247c8066ae76ad9e22ae1e18d upstream. When enabling CONFIG_RELOCATABLE and CONFIG_KASAN on FSL_BOOKE, the kernel doesn't boot. relocate_init() requires KASAN early shadow area to be set up because it needs access to the device tree through generic functions. Call kasan_early_init() before calling relocate_init() Reported-by: Lexi Shao Fixes: 2edb16efc899 ("powerpc/32: Add KASAN support") Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/b58426f1664a4b344ff696d18cacf3b3e8962111.1575036985.git.christophe.leroy@c-s.fr Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/kernel/head_fsl_booke.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S @@ -238,6 +238,9 @@ set_ivor: bl early_init +#ifdef CONFIG_KASAN + bl kasan_early_init +#endif #ifdef CONFIG_RELOCATABLE mr r3,r30 mr r4,r31 @@ -264,9 +267,6 @@ set_ivor: /* * Decide what sort of machine this is and initialize the MMU. */ -#ifdef CONFIG_KASAN - bl kasan_early_init -#endif mr r3,r30 mr r4,r31 bl machine_init