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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 87D54C433EC for ; Mon, 20 Jul 2020 15:41:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 627F120773 for ; Mon, 20 Jul 2020 15:41:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595259671; bh=HQ0RL3PqNuqnPSDpWahWC774iELBt8xrsGRygVPHgJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AqXsnUyTSUWo8f8uxZoBMxoi/yFpd0oUVADn3+B25bJJKxaa7U2lLVCL6Gsnk+qd3 oiwSfEY9BMCMGPnF0W3bpLLbBMEoWl9rKJFhogCV6l+jawbPiwhkUfynAjClHaHZIr 0JXioS3e3U5i3/8I4nB/U9w8M1H6r4ZRi/26c8gA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729094AbgGTPlK (ORCPT ); Mon, 20 Jul 2020 11:41:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:60646 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729802AbgGTPk6 (ORCPT ); Mon, 20 Jul 2020 11:40:58 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 B278520773; Mon, 20 Jul 2020 15:40:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595259658; bh=HQ0RL3PqNuqnPSDpWahWC774iELBt8xrsGRygVPHgJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ae2B5aIIqiZtrG/PO8OXJnZQ1Q9fgLoVLFz6c02exID6NVmBaA3wsY1dqmoXx9uTE CmMADztzMe01Eu4/Wd+1Lyzq+jwM1DOn+agytFIbGi2NirBUa+t/lRqiPpUtxS5RSw f7G5ELapS3O2q5B35ZHgZyob+YzuUozXC64ErkPM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Heiko Carstens , Vasily Gorbik , Sasha Levin , Alexander Egorenkov Subject: [PATCH 4.9 05/86] s390/kasan: fix early pgm check handler execution Date: Mon, 20 Jul 2020 17:36:01 +0200 Message-Id: <20200720152753.400716769@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152753.138974850@linuxfoundation.org> References: <20200720152753.138974850@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vasily Gorbik [ Upstream commit 998f5bbe3dbdab81c1cfb1aef7c3892f5d24f6c7 ] Currently if early_pgm_check_handler is called it ends up in pgm check loop. The problem is that early_pgm_check_handler is instrumented by KASAN but executed without DAT flag enabled which leads to addressing exception when KASAN checks try to access shadow memory. Fix that by executing early handlers with DAT flag on under KASAN as expected. Reported-and-tested-by: Alexander Egorenkov Reviewed-by: Heiko Carstens Signed-off-by: Vasily Gorbik Signed-off-by: Heiko Carstens Signed-off-by: Sasha Levin --- arch/s390/kernel/early.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index a651c2bc94ef8..f862cc27fe98f 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c @@ -288,6 +288,8 @@ static noinline __init void setup_lowcore_early(void) psw_t psw; psw.mask = PSW_MASK_BASE | PSW_DEFAULT_KEY | PSW_MASK_EA | PSW_MASK_BA; + if (IS_ENABLED(CONFIG_KASAN)) + psw.mask |= PSW_MASK_DAT; psw.addr = (unsigned long) s390_base_ext_handler; S390_lowcore.external_new_psw = psw; psw.addr = (unsigned long) s390_base_pgm_handler; -- 2.25.1