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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,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 D1183C388F3 for ; Tue, 1 Oct 2019 06:59:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 95F3A21872 for ; Tue, 1 Oct 2019 06:59:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=axtens.net header.i=@axtens.net header.b="PkKrMZvk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95F3A21872 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=axtens.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1F30D6B0008; Tue, 1 Oct 2019 02:59:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1CA476B000A; Tue, 1 Oct 2019 02:59:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E0476B000C; Tue, 1 Oct 2019 02:59:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0220.hostedemail.com [216.40.44.220]) by kanga.kvack.org (Postfix) with ESMTP id DF6776B0008 for ; Tue, 1 Oct 2019 02:58:59 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 57176181AC9AE for ; Tue, 1 Oct 2019 06:58:59 +0000 (UTC) X-FDA: 75994313598.13.feast45_143a7a3184535 X-HE-Tag: feast45_143a7a3184535 X-Filterd-Recvd-Size: 4971 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by imf06.hostedemail.com (Postfix) with ESMTP for ; Tue, 1 Oct 2019 06:58:58 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id h195so7233281pfe.5 for ; Mon, 30 Sep 2019 23:58:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ix0tFBRmdQmDh77QwfWZLAnX69tqINWfajYEldnceVk=; b=PkKrMZvkp74INNZKZ2dDIpCNCHVjGw8vj5JQwUl5yuKjn+mrkDNW8nd0IZRL/da0Oz 7fYU6QSXP186MQjobjFiMYF4HdN6zwscGQCBq3hJxKnmjoj5ZSDDM0bRTFsJsfIVE6Q+ OTWhweQ8a8sjTdtOPJIyMwGFIBF/D+52CCXT0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ix0tFBRmdQmDh77QwfWZLAnX69tqINWfajYEldnceVk=; b=kZ+ZaDWXUNbixGuMqPunKd44ISrnskaOvDQGniSBx7pe4vtb+0YXQBW//27MPorlMr wStNU3+p8u4aQ7IeKScI60h8KjXydDwSbI6XTAZirmKNKpMKsxgen8kqjnfZgi9NIzT9 h5WEL/OFw9Nms5Oun40J+zP+PZWeFDa7bDqrxPYMlkMpYfu1T5y9DHkN7qKkrka4v0z5 CnIkHoly7dFxmo1fcoOjFdQc2iJcSNFuGwVG7MB7VVO3Bi5Vo6ot2+LriNKlwDMN0d4Q m92LHXsMLhMujiNqJ1BPS3nqUxxLw8NIVVXWgkv4ylv0Sf1SS/PIkvluC6JktvItf7Si EfFA== X-Gm-Message-State: APjAAAVPdTMiij+CHa7njxOAh2Tg0sh3ABA5MUAqaF+wgjIxH+pDWQoZ JNyDm5h0U1AnSDI93v8vYtapdg== X-Google-Smtp-Source: APXvYqzGnBRD0kjONgaXtURBaqezFW/Qadqkue2P9h+PeB1Qy/HXS+o7oYYr+Hx3pOOW3xuZwH5UTA== X-Received: by 2002:a63:7d10:: with SMTP id y16mr28593557pgc.368.1569913137887; Mon, 30 Sep 2019 23:58:57 -0700 (PDT) Received: from localhost (ppp167-251-205.static.internode.on.net. [59.167.251.205]) by smtp.gmail.com with ESMTPSA id x12sm14654380pfm.130.2019.09.30.23.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 23:58:57 -0700 (PDT) From: Daniel Axtens To: kasan-dev@googlegroups.com, linux-mm@kvack.org, x86@kernel.org, aryabinin@virtuozzo.com, glider@google.com, luto@kernel.org, linux-kernel@vger.kernel.org, mark.rutland@arm.com, dvyukov@google.com, christophe.leroy@c-s.fr Cc: linuxppc-dev@lists.ozlabs.org, gor@linux.ibm.com, Daniel Axtens Subject: [PATCH v8 3/5] fork: support VMAP_STACK with KASAN_VMALLOC Date: Tue, 1 Oct 2019 16:58:32 +1000 Message-Id: <20191001065834.8880-4-dja@axtens.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191001065834.8880-1-dja@axtens.net> References: <20191001065834.8880-1-dja@axtens.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Supporting VMAP_STACK with KASAN_VMALLOC is straightforward: - clear the shadow region of vmapped stacks when swapping them in - tweak Kconfig to allow VMAP_STACK to be turned on with KASAN Reviewed-by: Dmitry Vyukov Signed-off-by: Daniel Axtens --- arch/Kconfig | 9 +++++---- kernel/fork.c | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 5f8a5d84dbbe..2d914990402f 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -843,16 +843,17 @@ config HAVE_ARCH_VMAP_STACK config VMAP_STACK default y bool "Use a virtually-mapped stack" - depends on HAVE_ARCH_VMAP_STACK && !KASAN + depends on HAVE_ARCH_VMAP_STACK + depends on !KASAN || KASAN_VMALLOC ---help--- Enable this if you want the use virtually-mapped kernel stacks with guard pages. This causes kernel stack overflows to be caught immediately rather than causing difficult-to-diagnose corruption. =20 - This is presently incompatible with KASAN because KASAN expects - the stack to map directly to the KASAN shadow map using a formula - that is incorrect if the stack is in vmalloc space. + To use this with KASAN, the architecture must support backing + virtual mappings with real shadow memory, and KASAN_VMALLOC must + be enabled. =20 config ARCH_OPTIONAL_KERNEL_RWX def_bool n diff --git a/kernel/fork.c b/kernel/fork.c index 6adbbcf448c3..0c9e6478ba85 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -94,6 +94,7 @@ #include #include #include +#include =20 #include #include @@ -229,6 +230,9 @@ static unsigned long *alloc_thread_stack_node(struct = task_struct *tsk, int node) if (!s) continue; =20 + /* Clear the KASAN shadow of the stack. */ + kasan_unpoison_shadow(s->addr, THREAD_SIZE); + /* Clear stale pointers from reused stack. */ memset(s->addr, 0, THREAD_SIZE); =20 --=20 2.20.1