From patchwork Thu Sep 24 22:50:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11798317 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E2971112E for ; Thu, 24 Sep 2020 22:51:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A89E62344C for ; Thu, 24 Sep 2020 22:51:21 +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="ALi2C5kO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A89E62344C 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 16A8D8E000E; Thu, 24 Sep 2020 18:51:19 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0D8A98E0001; Thu, 24 Sep 2020 18:51:19 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5FD28E000E; Thu, 24 Sep 2020 18:51:18 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0159.hostedemail.com [216.40.44.159]) by kanga.kvack.org (Postfix) with ESMTP id C44B88E0001 for ; Thu, 24 Sep 2020 18:51:18 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 8E629180AD802 for ; Thu, 24 Sep 2020 22:51:18 +0000 (UTC) X-FDA: 77299452636.04.slope96_5a0ad0b27162 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin04.hostedemail.com (Postfix) with ESMTP id 6B501800F345 for ; Thu, 24 Sep 2020 22:51:18 +0000 (UTC) X-Spam-Summary: 1,0,0,9d2611bcc3507176,d41d8cd98f00b204,35sjtxwokcoacpftgampxniqqing.eqonkpwz-oomxcem.qti@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:966:973:988:989:1042:1260:1277:1313:1314:1345:1359:1431:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:1981:2194:2196:2199:2200:2393:2559:2562:3138:3139:3140:3141:3142:3152:3352:3866:3867:3868:4250:4321:4385:5007:6261:6653:6742:7875:8957:9969:10004:10400:11026:11232:11473:11658:11914:12043:12048:12296:12297:12438:12555:12895:13069:13311:13357:14096:14097:14181:14394:14659:14721:21080:21324:21365:21444:21451:21627:21740:21772:30054,0,RBL:209.85.160.202:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yr6h5kn6qzsykgb34eef5m3hxmmopu4wuiw4o6gyzfb8gujbec3nwrrw93mnq.x1x4uqtcqsab5u9399hm9j34aj3noctrhtrzonjuxar9qabikct8kyh48op9swt.w-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:ne utral,Cu X-HE-Tag: slope96_5a0ad0b27162 X-Filterd-Recvd-Size: 4973 Received: from mail-qt1-f202.google.com (mail-qt1-f202.google.com [209.85.160.202]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Thu, 24 Sep 2020 22:51:17 +0000 (UTC) Received: by mail-qt1-f202.google.com with SMTP id o13so516666qtl.6 for ; Thu, 24 Sep 2020 15:51:17 -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=it1AK7tfxDHGBKnxx2DLY0hRUu4OKaOHj6i7en09YKs=; b=ALi2C5kOqkl/OJRAqsulcEdcFKGun0cgHqBtYtnF7CoZ6IzGfEqOeuPh+rRh0aasWl UBvXSIBuGS0GUoUW0lkyDopiz98Tl4rWLVi+dbQ8DNjPJebFR+6Bu8XC1zaF4MZ1NEvg UYwyhVeyXLta2Kr6HhgOcAqMKeQ5rjXtXzpPDKin6ZDyVjDYe6tqjHG+KQbhiX1mE0/G 4J/FPR+xoWKEHNSbXdgSztp7NC6Bbej1i1VxJOfR2QeetqQDzNYHYK1YJCvkLOODROJL JmsB7UL0Y8WH7QW6XcCXmrwUddUrG9jVy1KLdCUPwjYNPeTSgwLOqB9Pm++fO5Fakd3w HIDg== 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=it1AK7tfxDHGBKnxx2DLY0hRUu4OKaOHj6i7en09YKs=; b=FkmxXZ40HlTanUjalrNnwPE+ao7gaMXKxCjsuzlkEY/ClwxKmZb23f4faBSbr2iHE+ B0066DwpW4og3vxaKxyT/ri8zpOlefrR4yGgPC7YoCm5HGF8ljVL77vctCh3gFmPpez7 MM49EWtxjKWvPNz1sE6kDNFN0yZR/2AEdFxVf3VWXY3WzhzfPRhuxShLoaId2nZHa52f s+u4qL/9zDfXcU6TAH6fLMy70V8vOTWxm+gLDZf5qkWtonMDjYOzZu03hWPUjWzpI7mY bFXqEsTg1GkFEQrBQGEC4q54Q2o0f/XZsmdXoJJDXBIm9ZFnw70hYw69z36fNjEB3cPX sBQg== X-Gm-Message-State: AOAM532znm94j4vuiNoxkbpwS42/jVW3J8DAk/bEaAQt9Q2w2Q93Pbi/ Dum2+LTEVzHQfQUAwtgBltY4D1wz24xaNsMH X-Google-Smtp-Source: ABdhPJw1mPsBqvnTly5uEUo9UZOPr/SBw4BYLoKJFV8N0XtTrQHO+QodTG8/EqrEuCZQRq+ys+3yD30P3jSqaPs4 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:43e5:: with SMTP id f5mr1567528qvu.12.1600987877306; Thu, 24 Sep 2020 15:51:17 -0700 (PDT) Date: Fri, 25 Sep 2020 00:50:18 +0200 In-Reply-To: Message-Id: <728981bdedbca9dc1e4cca853699b6a6e8f244e0.1600987622.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH v3 11/39] 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 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 | 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.