From patchwork Thu Sep 21 06:45:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Tymoshenko X-Patchwork-Id: 13394544 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42D3DE7D0AB for ; Thu, 21 Sep 2023 20:30:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231841AbjIUUao (ORCPT ); Thu, 21 Sep 2023 16:30:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232617AbjIUUa2 (ORCPT ); Thu, 21 Sep 2023 16:30:28 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2948E7E for ; Thu, 21 Sep 2023 10:51:31 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id 98e67ed59e1d1-2748bffe932so854988a91.3 for ; Thu, 21 Sep 2023 10:51:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695318690; x=1695923490; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=6b+r/qO6jTNd+eQdEZK212ydTtWtBK6Hb2cWKKJgo7o=; b=KKItRZJSBBdDfJCYsYBnZvtBgSnXgyyoY2XnNsDG2iXTBjjPFVkvalnI+UHasXM4Bf wuaAPWy0SRjDplya3LHJSOKoBem1SlQPjJJvyc+SlBD8kLmoIutFPNLb4kgVEAyX0z8t RtvgNxzU2CcZkfXpJ4//jh1sp3ydGCQGNblg2My62bDuaQwtbvzzsxw6xSjmkB5jNwYw IZUU3wn5WjcWr+xWtwHvoadJ0YppHeFnVgQmVA/MvCwpqZpVQVy9KvfSrCU5oOzmcPbJ 2xeH4+SfvDVPrxYhnDrECoEvlC/V4SBxytUZMWlylIL+UslsSSCoPwY6APhe+8EKC3Or fJhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695318690; x=1695923490; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=6b+r/qO6jTNd+eQdEZK212ydTtWtBK6Hb2cWKKJgo7o=; b=mJ58LFqkloUGoydhmNdiUTKxcirSIuxYWuP+zXvJ4F4zsRYh4PTOKAWxPHq+JrPPeq H4XeCy1zsKKN+4j5ebz/ZF3ZCjPyXDISW2Iqld5ZeyJV8JfJqx4WrV6gYuMj672vKoqe NpELNyUruztoRO79YFWQiAaonphtbxTEviS1G7pjjp9RmXdQPAJ9Rc1HEB9fsJ1NQkpQ C4jkZ5rsc29oSZ6V2y3Y/vdeJHwpp4qzGlJQ1yYWMp3k+m+zgFOXfAAR9/vkwDvKswG/ 4In8xYbZBJ9k8+BtboesXsnE9tyiZ3uh0wkqHyPP+KBLR2/kE4+LyUqogMbxjGEEitY9 YTKQ== X-Gm-Message-State: AOJu0Yzi4KDJnYKvNDIWZFVMKpw45qXuh56f/7J7N2519uBowLXuUkue y/43cv3Dwt4VGFq8ACXhP5xUh1k= X-Google-Smtp-Source: AGHT+IFLA7pELMkRmPVUcV9dQSyP5wShtjA3I4pLFmR0wr3ICAIAxSCbstWOoMP3LDJ/cCr9C0wtfNw= X-Received: from hmarynka.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:925]) (user=ovt job=sendgmr) by 2002:a25:408f:0:b0:d7f:8774:dfd4 with SMTP id n137-20020a25408f000000b00d7f8774dfd4mr62822yba.12.1695278727640; Wed, 20 Sep 2023 23:45:27 -0700 (PDT) Date: Thu, 21 Sep 2023 06:45:05 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.42.0.459.ge4e396fd5e-goog Message-ID: <20230921064506.3420402-1-ovt@google.com> Subject: [PATCH] ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig From: Oleksandr Tymoshenko To: Mimi Zohar , Dmitry Kasatkin , Paul Moore , James Morris , "Serge E. Hallyn" , Nayna Jain Cc: ovt@google.com, rnv@google.com, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org The removal of IMA_TRUSTED_KEYRING made IMA_LOAD_X509 and IMA_BLACKLIST_KEYRING unavailable because the latter two depend on the former. Since IMA_TRUSTED_KEYRING was deprecated in favor of INTEGRITY_TRUSTED_KEYRING use it as a dependency for the two Kconfigs affected by the deprecation. Fixes: 5087fd9e80e5 ("ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig") Signed-off-by: Oleksandr Tymoshenko Reviewed-by: Nayna Jain --- security/integrity/ima/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index ecddc807c536..4e559bd1fd41 100644 --- a/security/integrity/ima/Kconfig +++ b/security/integrity/ima/Kconfig @@ -269,7 +269,7 @@ config IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY config IMA_BLACKLIST_KEYRING bool "Create IMA machine owner blacklist keyrings (EXPERIMENTAL)" depends on SYSTEM_TRUSTED_KEYRING - depends on IMA_TRUSTED_KEYRING + depends on INTEGRITY_TRUSTED_KEYRING default n help This option creates an IMA blacklist keyring, which contains all @@ -279,7 +279,7 @@ config IMA_BLACKLIST_KEYRING config IMA_LOAD_X509 bool "Load X509 certificate onto the '.ima' trusted keyring" - depends on IMA_TRUSTED_KEYRING + depends on INTEGRITY_TRUSTED_KEYRING default n help File signature verification is based on the public keys