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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 CC824C2D0A3 for ; Thu, 29 Oct 2020 19:27:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4D48220EDD for ; Thu, 29 Oct 2020 19:26:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="O/kauqeW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D48220EDD Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8DDA06B00A3; Thu, 29 Oct 2020 15:26:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 867CC6B00A4; Thu, 29 Oct 2020 15:26:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6E97A6B00A5; Thu, 29 Oct 2020 15:26:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0171.hostedemail.com [216.40.44.171]) by kanga.kvack.org (Postfix) with ESMTP id 30B216B00A3 for ; Thu, 29 Oct 2020 15:26:58 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id C5F20180AD807 for ; Thu, 29 Oct 2020 19:26:57 +0000 (UTC) X-FDA: 77425945674.25.legs30_20076a92728f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id A37F41804E3A0 for ; Thu, 29 Oct 2020 19:26:57 +0000 (UTC) X-HE-Tag: legs30_20076a92728f X-Filterd-Recvd-Size: 4986 Received: from mail-qv1-f74.google.com (mail-qv1-f74.google.com [209.85.219.74]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Thu, 29 Oct 2020 19:26:56 +0000 (UTC) Received: by mail-qv1-f74.google.com with SMTP id d16so2364887qvy.16 for ; Thu, 29 Oct 2020 12:26:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=n8TE6VLWWv4zp+ZnErvJoE/L5oOe+Pde/aeeJYIsZf4=; b=O/kauqeWNY0r84lS7RPHmlpaDP/mmCBXEzf8XgWD3KGlQrNQmBfLa4txgoYD7Zh6rS mIE6CKlfbMZtbBFE8xohCrCv7dwvAJbrRGCxi3rfcrMqaBiDWbS9j0C+nGrJZqBeIX7d jBWCVzbQR7PXrYGX+ZLKFx1i0gbyxVVxKTdO1lL70yMgFJdB5dprM1CkOAjpNeq3NMSx 8RA2H3qlB5MDxHjGmIevZXRRcNvMK05sYW5nPl2nOdsSLuiTwYu8wqfbrKhku+356arz Z2pJs0ucc0o2Gh+tsuNjicmUbykEkiOdG06qASqjn5+YaTaYapEaZkpX02mMQu9/2DXc dmug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=n8TE6VLWWv4zp+ZnErvJoE/L5oOe+Pde/aeeJYIsZf4=; b=X0GuPSyBKKojM7PkBNeIeRTHlLN7uDvO2c3eDsaOb/VjRap3TLx1LrODU7bIV2HU3w 7A2G+2IF5P+nNoXeXb5Ugt9+qi0qmpBGvlAbYGM79G7km8D1tRg4iPMOFREWTI2/zO+D Cf5UokgTexPXwwk9AdD5S3fgiAZ0EdjVhLzawYXQTX4fHalfgXo5QO+KcwZ8J3wQJP+/ 4AvkrAsKqu9CXprqnNUnHVex+vEgUnpQgMJbl/DmN03mxzLUOnmAPoqpUfm2sS+r+DAm JACfyGnV3cbBzv8QnvbxywqyfQBn7nV2OrzDyECh8S2oHTpYXrmWh1no6bRTavRsdpK1 kNgw== X-Gm-Message-State: AOAM533zWBm1/JOLNVYzd6vBETfWcB3aR5uibH/DwvDxZDH/ktiFPBo6 o7ywshfBo5kbgGerGbELMYhwKdWCV4uEw6DY X-Google-Smtp-Source: ABdhPJw1jx4wC13gVTfBQQYxOOayngDKS5CnqcrRcKt6xwjo5/eh1aWaZ/ASIoxlU/6FhJt3I/4WtwnzHWOVyQ24 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:9e0e:: with SMTP id p14mr5468422qve.25.1603999616340; Thu, 29 Oct 2020 12:26:56 -0700 (PDT) Date: Thu, 29 Oct 2020 20:25:41 +0100 In-Reply-To: Message-Id: <9f139555e8b9c10d120c3ee8da96973920476cfd.1603999489.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH v6 20/40] kasan: don't duplicate config dependencies From: Andrey Konovalov To: Catalin Marinas , Will Deacon Cc: Vincenzo Frascino , kasan-dev@googlegroups.com, Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" 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: Both KASAN_GENERIC and KASAN_SW_TAGS have common dependencies, move those to KASAN. Signed-off-by: Andrey Konovalov Signed-off-by: Vincenzo Frascino Reviewed-by: Marco Elver --- Change-Id: I77e475802e8f1750b9154fe4a6e6da4456054fcd --- lib/Kconfig.kasan | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index 8f0742a0f23e..ec59a0e26d09 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -24,6 +24,8 @@ menuconfig KASAN (HAVE_ARCH_KASAN_SW_TAGS && CC_HAS_KASAN_SW_TAGS) depends on (SLUB && SYSFS) || (SLAB && !DEBUG_SLAB) depends on CC_HAS_WORKING_NOSANITIZE_ADDRESS + select CONSTRUCTORS + select STACKDEPOT help Enables KASAN (KernelAddressSANitizer) - runtime memory debugger, designed to find out-of-bounds accesses and use-after-free bugs. @@ -46,10 +48,7 @@ choice config KASAN_GENERIC bool "Generic mode" depends on HAVE_ARCH_KASAN && CC_HAS_KASAN_GENERIC - depends on (SLUB && SYSFS) || (SLAB && !DEBUG_SLAB) select SLUB_DEBUG if SLUB - select CONSTRUCTORS - select STACKDEPOT help Enables generic KASAN mode. @@ -70,10 +69,7 @@ config KASAN_GENERIC config KASAN_SW_TAGS bool "Software tag-based mode" depends on HAVE_ARCH_KASAN_SW_TAGS && CC_HAS_KASAN_SW_TAGS - depends on (SLUB && SYSFS) || (SLAB && !DEBUG_SLAB) select SLUB_DEBUG if SLUB - select CONSTRUCTORS - select STACKDEPOT help Enables software tag-based KASAN mode. -- 2.29.1.341.ge80a0c044ae-goog