From patchwork Fri Aug 14 17:26:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11715033 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 CDD2E618 for ; Fri, 14 Aug 2020 17:29:57 +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 A65C920708 for ; Fri, 14 Aug 2020 17:29:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ot05y5dw"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="ZgHPshRZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A65C920708 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+patchwork-linux-arm=patchwork.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=ROKW7A5zuhbAKgQQ1Fgx2y7qd4XXNIYMkNN8Kiu0bk8=; b=Ot05y5dwFY5nfhVExwckzFXOR nNehK6NKE/BkL+9f86bSaa35LqoDTqPkgpUrsarmgTX8ALps5KESCsx5HXz7hZ/z6ez+D33obw/+r /oV/ehyLjXCdruRgHu5WtoTW10/LnBQe/+VKGmuxG7EW00X8HmsEBeHyoaagHNlA0Y/vD4eYjeUOs d0GfFRC0ZBX3vz1bVKRvTRR5ZtHQSyd7dAkr6Kabzvn59oZ87i1iEWFa5+mBJNIPFs157Qe0CPDEJ sp/eG6k5cSGLTRrewWNSbTkX0pCSpZGGZp1YOaKoznumSdWlHwGuQtdFXjwkk4OWDLkphi3eFfKWt wDmgPcGNQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k6dWS-0004GB-S0; Fri, 14 Aug 2020 17:29:44 +0000 Received: from mail-qv1-xf4a.google.com ([2607:f8b0:4864:20::f4a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k6dUc-0003Kt-Fb for linux-arm-kernel@lists.infradead.org; Fri, 14 Aug 2020 17:27:59 +0000 Received: by mail-qv1-xf4a.google.com with SMTP id i4so6527103qvv.4 for ; Fri, 14 Aug 2020 10:27:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=e2KGLRW+d0jj4Tv+MmRAX362NCHhZR9ltOsxskRbVvg=; b=ZgHPshRZ26bIOrhPnGktEcpoM4tZV4RKhQX3lqJKd1EpP9qvxqZkoQ//TjgMjABFsP X4gQzs7rYpoHS2j8HMRZztH46nKFN0f8FoOm4ob/a3l2ZAjbQkoVpjfH0/yaE8dhumd5 0d8vZL/unnnvG/TDju1HNtgWXEaMJOg6eIp7UdcXay50olpfSsmyekAAVaugXR0dJeTn e6Hn3yxKQdUb8ljAVhNKjg3fW9gUk6qdz8mWkrgF8LJzugzhP7SbGwS52yR0QKSQjGte vQNf9bfUTgTroD3lX0ezS8EKcqrPggGHqoco7Cc/jgGCX2K7ESwOHrmo0C8LEp+z1fH/ hmxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=e2KGLRW+d0jj4Tv+MmRAX362NCHhZR9ltOsxskRbVvg=; b=eyvVSGE8FYdeEZrNXQLYKZJ5WCR7Txzp2TObeoxyUtwioFYSBIuPbAdREnkLxeHuWR NCBIRpcDP/Sjzab9imiIRrU1PKduluBOlaBWUj3kukW5lEJPxI5wxL3MCVMOv6MKnzKL uiVhP0pthXoOiIFOSTzLhKftAxh+SZW/mC+hRt5f8tJFck5t/KIoHgZ/Tn/lUYUwAgxp bbSzo8eJWIBOMLuool9uFdnDtlpmNngRvTyiHeMN/N0++OGzbekTzsmHWfy1BLo1Cj0I xpdpdo+R8/1uRjt6vQhlxTD/yWkGYkURtwdmvTsuwOEyyEhuSwkR8mFQLNsay3uDFgiU B81g== X-Gm-Message-State: AOAM530VqUBwXC2hjPY0RUjYilrmjvEXdiLlGE0fEoZE0qqo+R9J9Z7P sQQOBSaxmcuhkVuHeNH8kYMIfWOqFF+scF+R X-Google-Smtp-Source: ABdhPJwvFCW71RrNBIBisU3qDI9g+D96gmQLmIYvDx+uRAkaisRTQSBeyenTGfi9SpAFmB/JOXIpogKSN0EeD35Y X-Received: by 2002:a05:6214:1086:: with SMTP id o6mr3450750qvr.41.1597426066233; Fri, 14 Aug 2020 10:27:46 -0700 (PDT) Date: Fri, 14 Aug 2020 19:26:51 +0200 In-Reply-To: Message-Id: <0197bbc0050e20ffdbf43eb8300af245c5c169db.1597425745.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog Subject: [PATCH 09/35] 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-20200814_132750_632693_52803E9B X-CRM114-Status: GOOD ( 10.74 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:f4a listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 DKIMWL_WL_MED DKIMwl.org - Medium sender 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 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Both KASAN_GENERIC and KASAN_SW_TAGS have common dependencies, move those to KASAN. Signed-off-by: Andrey Konovalov --- 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.