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 3A970C433E4 for ; Tue, 14 Jul 2020 19:12:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 105DC223AB for ; Tue, 14 Jul 2020 19:12:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753979; bh=/gmxHS3XLDyTXY59bVZQeIR8YytUDZlxFAMR595dCLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ow82od/110k8KTcIiNfu3kIruAbq9L3+VFP+6J6VX1/AeaXXbtCsLqFpDaRVo8ZMu LPxaGB6jmXo56F4VoUevp+eXy6+57ORyLyI4oHdUHz5MZGsWulxfd2eDAOFLkFRx4h rpwXDMwUc6d2KgLNEjf7z9vn4cF99vnD3nlbT+IU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729376AbgGNSqO (ORCPT ); Tue, 14 Jul 2020 14:46:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:40690 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729337AbgGNSqJ (ORCPT ); Tue, 14 Jul 2020 14:46:09 -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 AAE2C22282; Tue, 14 Jul 2020 18:46:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752369; bh=/gmxHS3XLDyTXY59bVZQeIR8YytUDZlxFAMR595dCLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cnTLTuFao7GCqxqKUdwMEsJKyMuti4NYz5dOTxB7TVyyMTWV9nUxtmPpoFsbBwEuU 1RvCSvrzshy0uiGo3Ho1xhFZm77X5wqzK8tFkdCxQBuwXGzH/P3/nsmxiRaRnZZUs4 fy61WRUmtgij81BNHO7prgGsLyrZB8WLInkGO/Z8= 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.19 16/58] s390/kasan: fix early pgm check handler execution Date: Tue, 14 Jul 2020 20:43:49 +0200 Message-Id: <20200714184056.958041028@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184056.149119318@linuxfoundation.org> References: <20200714184056.149119318@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: 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 e7e6608b996c6..ad88bed743954 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c @@ -155,6 +155,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