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 11126C433EA for ; Tue, 14 Jul 2020 19:11:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E4A0D22507 for ; Tue, 14 Jul 2020 19:11:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753881; bh=4+1CY02Uuaz+/7FNehvUYc0HJJynuT1ixS30/49OQKI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qd2FTqVfluHr2ZYP2jPZQdUhq4SuPw31wixAXWV5iFUrxBHU4cn/GgUAFX3czHmUW I42Q8S2r0Vzi9JuX7rAVGSMe8cJOX2TZ9NNeg2UYkGTKgMl8fodPuJ4Q9ef1FgBFoH TLbeCnCZp04HUE3x24l0gcuOoEL5l9OvhrgSfN/0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729909AbgGNTLU (ORCPT ); Tue, 14 Jul 2020 15:11:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:45182 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728926AbgGNStX (ORCPT ); Tue, 14 Jul 2020 14:49:23 -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 A2AAE22B3F; Tue, 14 Jul 2020 18:49:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752563; bh=4+1CY02Uuaz+/7FNehvUYc0HJJynuT1ixS30/49OQKI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ldz+V3zgFg32qCJ2GeCLPBbAbisbAebhMAkD/2KZBKQZegz3U1XthmUQE25LLpimH GmpHOfVOYXQj4q6an8TUd25u79n2WmdkVEew3na0QFCIj1fcUyexhHq+e2TnmV/+wJ e2b1uTrlKXIgg0DnkUiJ/ur/L8mWTzlQAtk5V2BQ= 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 5.4 025/109] s390/kasan: fix early pgm check handler execution Date: Tue, 14 Jul 2020 20:43:28 +0200 Message-Id: <20200714184106.735185073@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184105.507384017@linuxfoundation.org> References: <20200714184105.507384017@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 b432d63d0b373..2531776cf6cf9 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c @@ -169,6 +169,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