From patchwork Fri Nov 13 22:15:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11904997 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.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 9627BC55ABD for ; Fri, 13 Nov 2020 22:21:52 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0FD82207DE for ; Fri, 13 Nov 2020 22:21:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="IEBWVGA5"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="kVmEhB1R" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0FD82207DE Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iFq5xVGCMEU7p6zfU4sUgawaZvaB5QBenebDuLh2Cfc=; b=IEBWVGA5/TFxngY5Ir4vTX5f2 RtHc3zsdoexzWkX2InpYsbw7EkFqVvLfg4r1K91rAK493wZgHOB3VjHJMAHnizxG+lAuasbz823D0 p2jmsOEQwhV7IpJFc52GcBapF9UddI++yEk/i4o5jBXLnYO46y5I2BHWJYQtus/wEW8pvAVi/P58J NyVyli3DKtU8zH0Cdru4FWuWUarEA2K2CB9KPU0uZGKoobTf04Vi+A8aZQ+0r1XH9TQkUtYaTx7dS VBpvn4K6csny19Tw/xmahricQLaHN/WDo2swGLFfIkVMVxKjOko9nUs0NydblEQoOIGZB40BON2WL rSYyRAFXQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdhPw-00019j-17; Fri, 13 Nov 2020 22:19:40 +0000 Received: from mail-qv1-xf49.google.com ([2607:f8b0:4864:20::f49]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdhN6-0008R8-IL for linux-arm-kernel@lists.infradead.org; Fri, 13 Nov 2020 22:16:53 +0000 Received: by mail-qv1-xf49.google.com with SMTP id bn4so7036187qvb.9 for ; Fri, 13 Nov 2020 14:16:42 -0800 (PST) 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=DZs6bFexaQy6yZkAFEYlodVB+nboZ2AhHoU7HLOcEg0=; b=kVmEhB1R5T68qrqH2PCIT6I5z8rEfjQuVHTq5q7U8l81DHwSIZEsVQgZzDi3Lfxubd gLWqAgzUmXrd1yfnWchIW4l56Mig9Gepc/i62Qc+zuoD2cES+pyW3eSWDLtHJACB/Arf vf9920bMd4Ou9/bL75uVZcZLQwYnzwo/YL7C47ijPQ6X2lwvoj4s7fSuiAaUaKWzq2/f YaAB3TR637XDcl2pShdoLoHjzs+dAm+MMIuBqg+xTqn5rEqt+EH14C9k3lNbfkLMovbm JQnsDc2Vf6PsafFF0QdXnHUspBfIM+xfgxALHcMIKV/wZhSNs8NfpfOl/Yn7Vo/be8ML WFbw== 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=DZs6bFexaQy6yZkAFEYlodVB+nboZ2AhHoU7HLOcEg0=; b=c7FaoGWENbNjOdmZtVEjw+oWsWJQ/vqE6xtlOadMHE2ZghI5nueVT1fpGM9Cev2VH+ 95H8U/IboQ24hexB2nejbFnqP8zVU23NcqC7DC6q+WWKUTxJYnzgWyksnYusK464eqPr ytR7FBW8iMhuwwIraPMKOjJze/6qoy+tJu7eooEmp8MLMzLnKldpzHSJLVRv2aQa9Dnz XvbbxYaw9MMVzM3a4tIRnKBYeAODe65WKDqr8l69px1Zx7SkZ6hfPttQ+TBUr41WT0Z8 6zRbUL3k61Pfq3pmkIAX60Zzk1WC6+hx0mDyHDcCLhNWAHhlMZMTzdOHoyxU+5Y8dzb/ ydfg== X-Gm-Message-State: AOAM533eOCQlUAKGOaZChNMueyVkfV4TGRybZkjlTSmOhR7M3xMQQLUE ZRhCAwssB7wrkS/T2B3xxObGh2HekTB2DwbH X-Google-Smtp-Source: ABdhPJw2QKz7xJKJVr7+hZNeS2r4GFhBSesJcVBc6VZYBvJAw/C5eajSCZzQapV+YlR/EQO3beeBj0zFVtjBdtJF X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:4d84:: with SMTP id cv4mr4847839qvb.14.1605305800860; Fri, 13 Nov 2020 14:16:40 -0800 (PST) Date: Fri, 13 Nov 2020 23:15:39 +0100 In-Reply-To: Message-Id: <7a90eb85cf1f3bedcefa74bbbd73f9b532bcdd46.1605305705.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog Subject: [PATCH mm v10 11/42] kasan: don't duplicate config dependencies From: Andrey Konovalov To: Andrew Morton X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201113_171644_689890_D09C049F X-CRM114-Status: GOOD ( 11.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Marco Elver , Catalin Marinas , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Konovalov , Andrey Ryabinin , Vincenzo Frascino , Dmitry Vyukov Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Reviewed-by: Alexander Potapenko --- 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 58dd3b86ef84..c0e9e7874122 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.