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=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 100FBC43461 for ; Tue, 15 Sep 2020 21:33:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ABDD420731 for ; Tue, 15 Sep 2020 21:33: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="X1oFaYJ3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727591AbgIOVdO (ORCPT ); Tue, 15 Sep 2020 17:33:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728055AbgIOVQr (ORCPT ); Tue, 15 Sep 2020 17:16:47 -0400 Received: from mail-wr1-x44a.google.com (mail-wr1-x44a.google.com [IPv6:2a00:1450:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 166BCC061354 for ; Tue, 15 Sep 2020 14:16:46 -0700 (PDT) Received: by mail-wr1-x44a.google.com with SMTP id d9so1700298wrv.16 for ; Tue, 15 Sep 2020 14:16:46 -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=BdONTOcHhT5ryTedju+DUoHznOnFqEEPqO/13OyviNc=; b=X1oFaYJ3ruHAFYTNWhnNVd4ydUZPygtts9K7sLHGb4tL8soibh0M5VHrDRf8er6czC S3Bn9yMJmOywdqnJEpdb/8BnHtS6pKui5SvEFZs9pUnNbq5PwhYVkyTXXEQ/d5l88eo+ IjKYNtfww1UIZzqXqee6/vjaJdvWRoJD69TBXYgKT0WwZgX7TC3GJw+w4FmxT2lg+BLz J8Nkv3KOemu1M29hF5q6jkkaBkAGczwP4Fet7xpF+UoTNV4F978v/Vq/F+zUMGsIWY3E sdHEwpmqPkFbbulvvEhZssP09nuxFYuRdXW4rz/ERIQGqOpA6OK8rysgnJvDzj8sxUos o/2g== 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=BdONTOcHhT5ryTedju+DUoHznOnFqEEPqO/13OyviNc=; b=hAIF9KO4wtYBlkPEF1Myl1KcbjdWL6xK+lvMusFX8gtSmxSu0vmvYp3jsKMM8+h5gn avc7DXzRqIGMbyfVFDsE6smXEDTMqpQPl1YVvWgbTDXWX3PII5XpKsFlJQZzhhjvaRZp kheMo4ufGJvIXriYNbUJlYU2CGgVgg4VGp8go1csAV2YYz0SxrRwzl6cySVPB08hxQJl c60H1GOmgJ8DPfkKRZlOHl/a+3BbBPFikMUrj3eL1Z1fP/re+DuV67KNgxBKjYauOqhS mlJ1076ElkWEMOemJoU2BoxHjoAjnJ21nPA+osrslp3iG8774WSf6NK87Mjif6E3EsKY 8c2Q== X-Gm-Message-State: AOAM530s+MxuaJPm0y3q+msCv21rL2HIIcXL7/FgApxeSkJ0U9OAAtOs jWzFpcFuLSIoE26+lNr3GuOUYbnreOUMVOJz X-Google-Smtp-Source: ABdhPJyRaB4++4piH+N0WrxzDm3lIXLWNtbPvrqZh7r0LOgztg6BdoQfKl+Xjg2AISEKwNb86A0SmdpEYhDETYjx X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a5d:4709:: with SMTP id y9mr23509475wrq.59.1600204604330; Tue, 15 Sep 2020 14:16:44 -0700 (PDT) Date: Tue, 15 Sep 2020 23:15:51 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v2 09/37] 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" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 --- 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. -- 2.28.0.618.gf4bc123cb7-goog 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=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 5D58BC43461 for ; Tue, 15 Sep 2020 21:16:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0439E20770 for ; Tue, 15 Sep 2020 21:16:47 +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="X1oFaYJ3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0439E20770 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 DFDBB90007C; Tue, 15 Sep 2020 17:16:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D38FE900012; Tue, 15 Sep 2020 17:16:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BFBA290007C; Tue, 15 Sep 2020 17:16:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0153.hostedemail.com [216.40.44.153]) by kanga.kvack.org (Postfix) with ESMTP id A8199900012 for ; Tue, 15 Sep 2020 17:16:46 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 6F003181AEF07 for ; Tue, 15 Sep 2020 21:16:46 +0000 (UTC) X-FDA: 77266555212.30.top89_580636f27114 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 44EAE180B3C83 for ; Tue, 15 Sep 2020 21:16:46 +0000 (UTC) X-HE-Tag: top89_580636f27114 X-Filterd-Recvd-Size: 4970 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Sep 2020 21:16:45 +0000 (UTC) Received: by mail-wr1-f74.google.com with SMTP id b7so1711591wrn.6 for ; Tue, 15 Sep 2020 14:16:45 -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=BdONTOcHhT5ryTedju+DUoHznOnFqEEPqO/13OyviNc=; b=X1oFaYJ3ruHAFYTNWhnNVd4ydUZPygtts9K7sLHGb4tL8soibh0M5VHrDRf8er6czC S3Bn9yMJmOywdqnJEpdb/8BnHtS6pKui5SvEFZs9pUnNbq5PwhYVkyTXXEQ/d5l88eo+ IjKYNtfww1UIZzqXqee6/vjaJdvWRoJD69TBXYgKT0WwZgX7TC3GJw+w4FmxT2lg+BLz J8Nkv3KOemu1M29hF5q6jkkaBkAGczwP4Fet7xpF+UoTNV4F978v/Vq/F+zUMGsIWY3E sdHEwpmqPkFbbulvvEhZssP09nuxFYuRdXW4rz/ERIQGqOpA6OK8rysgnJvDzj8sxUos o/2g== 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=BdONTOcHhT5ryTedju+DUoHznOnFqEEPqO/13OyviNc=; b=apthBGsqzREVWiuNFfVNfzqiExZ/vEwz7PFojHOZfS99iuyjv9/xAMoyeOooKQBFcE v2V3iZoyEWy51VR2bb43ws8cdqwtKhHfN96MWnGxJSxJNpBldA8QQlc5ae+e3HKobY16 C5UUgRPBCTkZrDKwIc0F8N2kzdZXtgO95AR7RkefcEEv6sBAOQ1jCYO86DhdAZbSnf8a D/lUjkfsOiGunuHDdmyo9Y6RixXcF1QcLigSKXdlAQFMfMUGaKL2iyVSkPApKoEpKf8R HGRxQj8LhmjfeDjsfGmoAqU1m/4ckegHBhpk6P2o34WZUiF90wTWMCgRFodnNTp02LLO HIRg== X-Gm-Message-State: AOAM530WI3zqLDrMJPRD14udsejh3k63obD4Pxk1n7Nwqbws8Le/Wm0L Zap8zQEx6gN8H6LMLcOViPH3oTdBLHj6WrVL X-Google-Smtp-Source: ABdhPJyRaB4++4piH+N0WrxzDm3lIXLWNtbPvrqZh7r0LOgztg6BdoQfKl+Xjg2AISEKwNb86A0SmdpEYhDETYjx X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a5d:4709:: with SMTP id y9mr23509475wrq.59.1600204604330; Tue, 15 Sep 2020 14:16:44 -0700 (PDT) Date: Tue, 15 Sep 2020 23:15:51 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v2 09/37] 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: 44EAE180B3C83 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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 --- 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. -- 2.28.0.618.gf4bc123cb7-goog 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=-15.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 89B5CC43461 for ; Tue, 15 Sep 2020 21:20:42 +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 3EDD320720 for ; Tue, 15 Sep 2020 21:20:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="DH9ADyPM"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="X1oFaYJ3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3EDD320720 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=L8wVXUDi1h7h6KPNbuRHjlIPpgJWfsSedWOszADuknk=; b=DH9ADyPM464ve6Rml6pZ6qu0i 0G/b6pyk9o/mJMbJkponhRgQowr9lcRdHxICS3s5mj6MyCi8oC5CiqrrtoKALUHxs83myj05a3q9V NVT+CjruV1yKDsyAighECLzMEQz82Wn3ogwhnzt8DUIssSvd00PdoHWTYBNBsDk1ivK6Rhm9KcGFg 4mBB+s4bWjTySRbkeqmYrTxlOzXpWnnuQtgEOLCSLVMhvGr0ZQom3n7GC7Ee+4pCQASog67JGjUWj NkPk33inVnTh87+imEpinSwCHeif32Sp2LwNH+wvM5YNqDPRU3ZGrW/oxtioPhrtqpVXlz5J4Hz54 Oau8GL6gQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIILj-0007lb-Af; Tue, 15 Sep 2020 21:18:51 +0000 Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIIJj-0006u4-Iu for linux-arm-kernel@lists.infradead.org; Tue, 15 Sep 2020 21:16:51 +0000 Received: by mail-wr1-x449.google.com with SMTP id r16so1692538wrm.18 for ; Tue, 15 Sep 2020 14:16:45 -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=BdONTOcHhT5ryTedju+DUoHznOnFqEEPqO/13OyviNc=; b=X1oFaYJ3ruHAFYTNWhnNVd4ydUZPygtts9K7sLHGb4tL8soibh0M5VHrDRf8er6czC S3Bn9yMJmOywdqnJEpdb/8BnHtS6pKui5SvEFZs9pUnNbq5PwhYVkyTXXEQ/d5l88eo+ IjKYNtfww1UIZzqXqee6/vjaJdvWRoJD69TBXYgKT0WwZgX7TC3GJw+w4FmxT2lg+BLz J8Nkv3KOemu1M29hF5q6jkkaBkAGczwP4Fet7xpF+UoTNV4F978v/Vq/F+zUMGsIWY3E sdHEwpmqPkFbbulvvEhZssP09nuxFYuRdXW4rz/ERIQGqOpA6OK8rysgnJvDzj8sxUos o/2g== 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=BdONTOcHhT5ryTedju+DUoHznOnFqEEPqO/13OyviNc=; b=k9/UGXF+TfQzbglBwqc2P8KgieIblJ2753nmxlodIx4JxoGbbBvjX7bKgLAz4+Xjrj EwPIbIGsbirkZnEBkNkV0dCVDAbST/Dna0erjNEdMRLOvGyCFmce6M+GnuP60ghNG8WO MGauU5u3bBmvmrACillnb9vgQ3cE3MrbELxak2sEj0GbAMXQrV5HGuO5325Zqh6uf4XC GvI95e6qQqmpju/CY/OL2F4HEyFzxK1tGv3TNfG386xsdPtqUl5VTShnY6zwxS34+LQn 019q8AjnXekCiFVOgf7R8bNQ5oYivjqSA1ymzO4tYsE2pTtB/ZVYolFECcRGg95fDYUw C0aw== X-Gm-Message-State: AOAM532uLIHrd1HHOb5zSinBuC5xXKKmyoe2x/4Et28opcLwkrZ5IYGj 14jZSCU8imhexMxALjG6rzOBI3Z+QmYIC7Pb X-Google-Smtp-Source: ABdhPJyRaB4++4piH+N0WrxzDm3lIXLWNtbPvrqZh7r0LOgztg6BdoQfKl+Xjg2AISEKwNb86A0SmdpEYhDETYjx X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a5d:4709:: with SMTP id y9mr23509475wrq.59.1600204604330; Tue, 15 Sep 2020 14:16:44 -0700 (PDT) Date: Tue, 15 Sep 2020 23:15:51 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v2 09/37] kasan: don't duplicate config dependencies From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200915_171647_663300_341E216E X-CRM114-Status: GOOD ( 11.86 ) 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: Marco Elver , Elena Petrova , Andrey Konovalov , Kevin Brodsky , Will Deacon , Branislav Rankov , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , linux-arm-kernel@lists.infradead.org, Andrey Ryabinin , Andrew Morton , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 --- 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. -- 2.28.0.618.gf4bc123cb7-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel