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=-20.6 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 E3C0AC433DF for ; Fri, 14 Aug 2020 17:27:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9233520708 for ; Fri, 14 Aug 2020 17:27:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ZgHPshRZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9233520708 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 245426B0010; Fri, 14 Aug 2020 13:27:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F3E66B0022; Fri, 14 Aug 2020 13:27:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 10CDE6B0023; Fri, 14 Aug 2020 13:27:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0067.hostedemail.com [216.40.44.67]) by kanga.kvack.org (Postfix) with ESMTP id EB34B6B0010 for ; Fri, 14 Aug 2020 13:27:47 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id AED61824556B for ; Fri, 14 Aug 2020 17:27:47 +0000 (UTC) X-FDA: 77149856574.06.boat77_1c1810e26ffe Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin06.hostedemail.com (Postfix) with ESMTP id 83B62100CF963 for ; Fri, 14 Aug 2020 17:27:47 +0000 (UTC) X-HE-Tag: boat77_1c1810e26ffe X-Filterd-Recvd-Size: 4650 Received: from mail-qv1-f74.google.com (mail-qv1-f74.google.com [209.85.219.74]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Fri, 14 Aug 2020 17:27:46 +0000 (UTC) Received: by mail-qv1-f74.google.com with SMTP id l10so6480619qvw.22 for ; Fri, 14 Aug 2020 10:27:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=e2KGLRW+d0jj4Tv+MmRAX362NCHhZR9ltOsxskRbVvg=; b=ZgHPshRZ26bIOrhPnGktEcpoM4tZV4RKhQX3lqJKd1EpP9qvxqZkoQ//TjgMjABFsP X4gQzs7rYpoHS2j8HMRZztH46nKFN0f8FoOm4ob/a3l2ZAjbQkoVpjfH0/yaE8dhumd5 0d8vZL/unnnvG/TDju1HNtgWXEaMJOg6eIp7UdcXay50olpfSsmyekAAVaugXR0dJeTn e6Hn3yxKQdUb8ljAVhNKjg3fW9gUk6qdz8mWkrgF8LJzugzhP7SbGwS52yR0QKSQjGte vQNf9bfUTgTroD3lX0ezS8EKcqrPggGHqoco7Cc/jgGCX2K7ESwOHrmo0C8LEp+z1fH/ hmxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=e2KGLRW+d0jj4Tv+MmRAX362NCHhZR9ltOsxskRbVvg=; b=ZKv8+YrZScJpUKAFcQBUVAW3bwEGMp1JAm8r0gpLfuYUEntZ0AGVe+u3R0j19l5po7 d4Nslpl6IEWJwOMOLFGQAeJjbsQ36a/uTD/lsJ66SgUb71wQMfr9Q3vldw+D9wbG2GRD pjE+xswGiX7NWiT8tcxtgGGbagaeGagMnTjeMJUy6SBblBAxoU9zhKPLsilKaflXaPYx 0KswUOvAKZpiEOfReHngo1Qh8fCVUmO7gc61VC02QtAPWomGQ5C4cbI3e4Bgep/1uC/w kgliJsOiwgK8bX+P/zsj5aAZPZhjFob+/UYcZA2Wkz6FiZCjDSQh+dUYrfsOR6P7Ttsj pyPg== X-Gm-Message-State: AOAM532O/zwmVfjixyPvh/dS2QiX9c3pBip0Rrh6vx5Xuz+s1LdGw9n3 suG0JG9g9OpF3IdWVYoHXn1THtjHt6ZOLDn2 X-Google-Smtp-Source: ABdhPJwvFCW71RrNBIBisU3qDI9g+D96gmQLmIYvDx+uRAkaisRTQSBeyenTGfi9SpAFmB/JOXIpogKSN0EeD35Y X-Received: by 2002:a05:6214:1086:: with SMTP id o6mr3450750qvr.41.1597426066233; Fri, 14 Aug 2020 10:27:46 -0700 (PDT) Date: Fri, 14 Aug 2020 19:26:51 +0200 In-Reply-To: Message-Id: <0197bbc0050e20ffdbf43eb8300af245c5c169db.1597425745.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog Subject: [PATCH 09/35] kasan: don't duplicate config dependencies From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com Cc: Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Will Deacon , 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-Rspamd-Queue-Id: 83B62100CF963 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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 --- lib/Kconfig.kasan | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index e1d55331b618..b4cf6c519d71 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -24,6 +24,9 @@ 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 SLUB_DEBUG if SLUB + 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 +49,6 @@ 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,6 @@ 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.28.0.220.ged08abb693-goog