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=-7.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 8914CC433DF for ; Mon, 10 Aug 2020 02:39:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 66948206CD for ; Mon, 10 Aug 2020 02:39:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597027146; bh=6EBTzKOcpQr4WsAWcP6jYrk13kRU7iIlv9pI0/fZk48=; h=Date:From:To:Subject:Reply-To:List-ID:From; b=SyBwzjdxYZeJF95pOVi5YPBkJOcpx69bgfzu4qP1v25zd0Ibn2VFtagy3RANW/UoF FTfM5IGVU5Vo6RyAe5ifb6mszvF/fNxYzdKlnofkCxb4eZYh58zUkttcvr1dAtxiiq DfPSu9j9YnR/4tlr1GD+NyQnZU/Wiqdg1buleco4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726382AbgHJCjG (ORCPT ); Sun, 9 Aug 2020 22:39:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:42310 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726335AbgHJCjG (ORCPT ); Sun, 9 Aug 2020 22:39:06 -0400 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (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 63BAD2065D; Mon, 10 Aug 2020 02:39:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597027145; bh=6EBTzKOcpQr4WsAWcP6jYrk13kRU7iIlv9pI0/fZk48=; h=Date:From:To:Subject:From; b=aPOdg++u3KC5OxvRh0gvVHaN/WMKEs0G6sYQb/SALBXfZPoEAE9oLdFhioJt/vbGn LzrxGZUjbXEWAH+3SqKjXzp1g3DdzP3rteOGrN5O5bz6NWV3E7AIKABz9Eq0ne6y02 JbEHTz+xFWG2awCG43LNXsAg/RzfKM4rad7Z9M+E= Date: Sun, 09 Aug 2020 19:39:05 -0700 From: akpm@linux-foundation.org To: andreyknvl@google.com, arnd@arndb.de, aryabinin@virtuozzo.com, dja@axtens.net, dvyukov@google.com, elver@google.com, mm-commits@vger.kernel.org, ndesaulniers@google.com, walter-zh.wu@mediatek.com Subject: [merged] kasan-improve-and-simplify-kconfigkasan.patch removed from -mm tree Message-ID: <20200810023905.KCBhCDKHh%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: mm-commits-owner@vger.kernel.org Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: kasan: improve and simplify Kconfig.kasan has been removed from the -mm tree. Its filename was kasan-improve-and-simplify-kconfigkasan.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Marco Elver Subject: kasan: improve and simplify Kconfig.kasan Turn 'KASAN' into a menuconfig, to avoid cluttering its parent menu with the suboptions if enabled. Use 'if KASAN ... endif' instead of having to 'depend on KASAN' for each entry. Link: http://lkml.kernel.org/r/20200629104157.3242503-1-elver@google.com Signed-off-by: Marco Elver Reviewed-by: Andrey Konovalov Cc: Andrey Ryabinin Cc: Arnd Bergmann Cc: Daniel Axtens Cc: Dmitry Vyukov Cc: Nick Desaulniers Cc: Walter Wu Signed-off-by: Andrew Morton --- lib/Kconfig.kasan | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) --- a/lib/Kconfig.kasan~kasan-improve-and-simplify-kconfigkasan +++ a/lib/Kconfig.kasan @@ -18,7 +18,7 @@ config CC_HAS_KASAN_SW_TAGS config CC_HAS_WORKING_NOSANITIZE_ADDRESS def_bool !CC_IS_GCC || GCC_VERSION >= 80300 -config KASAN +menuconfig KASAN bool "KASAN: runtime memory debugger" depends on (HAVE_ARCH_KASAN && CC_HAS_KASAN_GENERIC) || \ (HAVE_ARCH_KASAN_SW_TAGS && CC_HAS_KASAN_SW_TAGS) @@ -29,9 +29,10 @@ config KASAN designed to find out-of-bounds accesses and use-after-free bugs. See Documentation/dev-tools/kasan.rst for details. +if KASAN + choice prompt "KASAN mode" - depends on KASAN default KASAN_GENERIC help KASAN has two modes: generic KASAN (similar to userspace ASan, @@ -88,7 +89,6 @@ endchoice choice prompt "Instrumentation type" - depends on KASAN default KASAN_OUTLINE config KASAN_OUTLINE @@ -113,7 +113,6 @@ endchoice config KASAN_STACK_ENABLE bool "Enable stack instrumentation (unsafe)" if CC_IS_CLANG && !COMPILE_TEST - depends on KASAN help The LLVM stack address sanitizer has a know problem that causes excessive stack usage in a lot of functions, see @@ -134,7 +133,7 @@ config KASAN_STACK config KASAN_S390_4_LEVEL_PAGING bool "KASan: use 4-level paging" - depends on KASAN && S390 + depends on S390 help Compiling the kernel with KASan disables automatic 3-level vs 4-level paging selection. 3-level paging is used by default (up @@ -151,7 +150,7 @@ config KASAN_SW_TAGS_IDENTIFY config KASAN_VMALLOC bool "Back mappings in vmalloc space with real shadow memory" - depends on KASAN && HAVE_ARCH_KASAN_VMALLOC + depends on HAVE_ARCH_KASAN_VMALLOC help By default, the shadow region for vmalloc space is the read-only zero page. This means that KASAN cannot detect errors involving @@ -164,8 +163,10 @@ config KASAN_VMALLOC config TEST_KASAN tristate "Module for testing KASAN for bug detection" - depends on m && KASAN + depends on m help This is a test module doing various nasty things like out of bounds accesses, use after free. It is useful for testing kernel debugging features like KASAN. + +endif # KASAN _ Patches currently in -mm which might be from elver@google.com are kcov-unconditionally-add-fno-stack-protector-to-compiler-options.patch