From patchwork Mon Nov 23 20:07:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11926461 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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 3265FC2D0E4 for ; Mon, 23 Nov 2020 20:13:54 +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 ADA5D20657 for ; Mon, 23 Nov 2020 20:13:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="xypB4IP/"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="uY5LZg+U" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ADA5D20657 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=m/1o79QADxkoi71O3FS47kMm0dUtCCxR25MFdZuCrSQ=; b=xypB4IP/XvOgmGNvDNfop8E/z pRq10mwhD+lUL1IHwTecciEjhp3uAimD7ulzRbjrevf9qfMC96L6vz4aKTRRp2dQwxd91/Vs0hQYr t8Zkrbap6aD+DJ2jUNU/i9l25op/gMROUaDEt7cVKzzlm3wh6k36BI5sEjfFrXyV8gsyrwuUxqj66 U7JF2aStzbJBel7C291H50t/yNM0lPwvuyvKtLtq8IB9eV72maoul8UgXU/gsiJMmbCLm5nBkpdrQ gQpBAd2/X96DBNdvpUgL0ECj0G5RsW+9R6mQOemEpTvsheN4tOzQ9TkpvtTvQor4LBbtc444AyBeM cNOvLdT8A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khICy-0001Ir-4q; Mon, 23 Nov 2020 20:13:08 +0000 Received: from mail-qt1-x84a.google.com ([2607:f8b0:4864:20::84a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khI8n-00082O-SD for linux-arm-kernel@lists.infradead.org; Mon, 23 Nov 2020 20:09:19 +0000 Received: by mail-qt1-x84a.google.com with SMTP id z8so14386569qti.17 for ; Mon, 23 Nov 2020 12:08:46 -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=OXazw0I6oeLRK+aCYmOjFIB4MLt2eUKUeL0RxFWmIM8=; b=uY5LZg+UwdiqaGPDeNSvDU26KQ8vIKer+TEuj37rMjsEmiRCRkqQ6q6tYpGMekWxVt Kz6Ti1mxjCfJY6wtwnDD1Ynm8jH43l4mZBVPvIbqoOa3ciRd3Qx3HtxGE3GV1o2hYR+o 3zo4KBsUptvfOKheP5TEUNfl5HEaMCmgD8d7zS2cJV4qndA7qtsuV3jUNgAAAMQLxTnU Eiky53BjqPsH0zvqdNSb0Z3ogXlXsLpkyxdfyEZ+7Puw7dJY0N9H8pbTMLwMAmkkexnn r4/Y1FyXS6JYPzpnC6Cd3mI3RzL/L2r+oEHHexFPuB40z/9uz2N3kiEN52Qq0t4hfFRR kw0g== 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=OXazw0I6oeLRK+aCYmOjFIB4MLt2eUKUeL0RxFWmIM8=; b=V+scq1SvSlIUcxnBNEBF+qpZoEO2x7FX1ppCI97j3boOaRxipETyfKE2M3YJS/wlYh DRTE+bNMU1Q3w1qx58FAQJswUVDKj2Zntn1Tvi74th9yl1bJ0tKt7koWJKMkc/VIbent qgVj+7gzL9ECDLATloPPWxzxJQpy+wQa6M1UvyBFp98VUTQReEDrXfugUEAZSdnVGTzp cn5Ql1X8tR7fpQTC2wi5sUxxbS4giy32F5nn2fU5qo6s/prnDCaGAFqtQzjwj0wSO5Oc 8NTm7vnabO00tynbO8Xw2ryl0eUFDyfQBaAg8gDA0yigXlQ6gotsHiONG9YuS9MPre1g fVuw== X-Gm-Message-State: AOAM531vgeyfi9/42je+IPyPAX+6ZurYTtJKAcAixHHhQiZMiJnZaj7x EBuaY2mbpoLQRevOSclk2iOO/MFjCZkSirF0 X-Google-Smtp-Source: ABdhPJz22ud/PXO8phnLko2cHn56ep4euY5DeHkzZKbHlVpubcW966v4DWRQqWNvzlvRK9Fagsf98npD01lzyt6/ X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:366:: with SMTP id t6mr1124442qvu.58.1606162124786; Mon, 23 Nov 2020 12:08:44 -0800 (PST) Date: Mon, 23 Nov 2020 21:07:35 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog Subject: [PATCH mm v11 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-20201123_150850_000159_D1CAABF6 X-CRM114-Status: GOOD ( 12.19 ) 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.