From patchwork Tue Nov 10 22:10:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11895607 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 7EED4C4742C for ; Tue, 10 Nov 2020 22:14:59 +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 1B15520674 for ; Tue, 10 Nov 2020 22:14:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="G3Uio9GP"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="MYF2YNk2"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="QydEmdA1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B15520674 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=nj4sA4Aa7l2ftBiY/uFRIDvKXH/F05dxpCP8C/KGpb0=; b=G3Uio9GPN/ZFPeKtQ+wAhuLWk 3js1k5ZSLal8zk0N72WV/Lt1KNwTN/h2tA5zzaopc48iH7zKpCiInx+1FjiK0BG1wXdvbe5+/vHzf ehNYRLm5LejZW7uQK8DBzPMJQgQ+bNsIqXvsp/UPVrdlW3jXIaIzov1sFsvCnIv3JMjPu34/gsvu8 JAlBdId+9M/4v4F9grAdIv7Fmi+UeEUDwgZOVk9RQJIgWS7XaUAKEJ0nlxU77JoGh4xJk8XKJnYcb LGea/T0cfKYUYXznldHtN/Es/o92D0NyCzPMvKihxAo9wUORQeAzAEQIDETEpzibAJoE3GiqAlQH4 5STPDlzFw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcbu6-0005de-4r; Tue, 10 Nov 2020 22:14:18 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcbre-0004fc-9r for linux-arm-kernel@merlin.infradead.org; Tue, 10 Nov 2020 22:11:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:Cc:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=UUYs3/IPjbrn0Fy6AEi8q/1m6cYKglUE4ldVZ9aX59U=; b=MYF2YNk2zawIZiD8Sveud8QVG1 Wrf4v9bAYYidgDFnl92K1hdATFV9DK7rkBadJtxxCz14dHcLMdMyBmnCInLd1sS2h7h1P7mO8WWvH EI/vpVKEHHAr1kDEA9MEHmBLbQpWjF5iiLo8qBlV5psexCnNuPo0RTY8fSz0v4EYZugyjtCn3zlkX /rPEORPm+1Z/3AZFoS90OcXfCQSFXwb6XouG3yAP34MQb8F5wuVscMRlMpgVq9hUiaPkO59ob+18C F/lolS8FAAjKbN4Gzqy5EyZxMDNfxIBKgnR3Mh3GR0k3Z9Dtw3kyqeBEvXR46Yt6Jsit+hE6bjF9L i+XRq+Zw==; Received: from mail-qk1-x749.google.com ([2607:f8b0:4864:20::749]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcbrZ-0007Td-EU for linux-arm-kernel@lists.infradead.org; Tue, 10 Nov 2020 22:11:44 +0000 Received: by mail-qk1-x749.google.com with SMTP id f9so185384qkg.13 for ; Tue, 10 Nov 2020 14:11:37 -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=UUYs3/IPjbrn0Fy6AEi8q/1m6cYKglUE4ldVZ9aX59U=; b=QydEmdA1Gp7eDtmYL2akJJN4XP/XDdS7K0035eTRBqfwpOiTsI8qckQMz67w5NLOu9 /2ZH8t1mD1hbruAMJrD/JJb+mmmO87gx+ODjoX5iPANTPnzJveL5vHGbNNSJYp3Ez8Vz pMt3WkTfTLW37HVWft91uPgK5UJORgic0Ob9XpK+f/Lw4aErxSlMVWqiQxCbxJI1MJUZ i5ooDewzPIra+kCFLauGA//Elk03zfQXErM4ncvUGDnCFCcqTjgh3HOVPc6QXQEaf6vn //VO5+/j5fAyJlvVgQ8QCUnmcxWYQuwma0bK5WJJ7hXCMT/9+lGD+kb5wBY0fVW+LGLg CyCA== 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=UUYs3/IPjbrn0Fy6AEi8q/1m6cYKglUE4ldVZ9aX59U=; b=FkhLeZgBDfSXS10aXHvZPAQA2fv63dWA912PqxY4vnLznPh2o7w5MDrRx4opGL1oab O298mbflSUAuAn8JkZCp1mmMLU6ihpiESf8PiaM1bhTlop0CtQ+KKQ9KrJVlbUfDir/J z9Qaev0LlmZXHLiO43EnaRTHQQvyKp3vJ9xE/9MROKiANWELew535WG3DgV2GlzczHrW e/ucqkuIPu/5VmK9a5XzwR/8AhOCvVPQH2KrP8yqsXhiEzTReYA7jBhoJZYOp3DXmp9P FcG6T4XvbnyKccv2oolh2YJ321AvETeR6UCf+k0C9OhbEEwLre6hggxv326orBhI43iG +dCw== X-Gm-Message-State: AOAM531t9ipbeqJYEB7+lElSjjWATeeiTA1vddyCvqtkTGN2dBawFyfJ k+hO1NzzWOo2/xPzmrF7e4re57tMxVLFTbjw X-Google-Smtp-Source: ABdhPJxBGmgnkdqlgcqU0fxuPE0cGKNTmRvZZzDmGb5C/wSdyzJI0RXRE/HBsl7sZ1hYsisb1ALC2svdh6jJeS74 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:524b:: with SMTP id s11mr16651952qvq.3.1605046294997; Tue, 10 Nov 2020 14:11:34 -0800 (PST) Date: Tue, 10 Nov 2020 23:10:09 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.222.g5d2a92d10f8-goog Subject: [PATCH v9 12/44] kasan: don't duplicate config dependencies From: Andrey Konovalov To: Catalin Marinas X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201110_221142_143207_8C6F3902 X-CRM114-Status: GOOD ( 10.26 ) 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 , Andrey Konovalov , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Ryabinin , Andrew Morton , 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 8f0742a0f23e..ec59a0e26d09 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.