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: 142918 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5145716vqi; Thu, 21 Sep 2023 14:20:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEj7s4LvtNWcY/ChyM4iUdqVo510lAHUAIU+a7fMeyieUr39o8axYRi8xcov+jnZu/XPLaB X-Received: by 2002:a05:6808:1386:b0:3ad:fcd5:3dd6 with SMTP id c6-20020a056808138600b003adfcd53dd6mr4708878oiw.13.1695331216850; Thu, 21 Sep 2023 14:20:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695331216; cv=none; d=google.com; s=arc-20160816; b=E6KEC6hMEDHG+XQ2FaX8qJdCWhVXMO4PSDfw/KSGXci82Tu9Et2KVk/MCQ0Zt5yIMD Re9tH/MTkpno/TrhXLdCU1puS6Bz9d0Xow1GpOncdCk5nbHFtY5cCDvMScwl1O0phUjv eavNVeYdTeiSPnQoXNyiwkujOGLU/n57PJN/AzMd05RuUY/SAggFoC9PE+yIauoPpmoD lTok7NjFLvAapdsn7lqizK5oDs2cbddpR3T2KwP5RPdaRx7ak8/YPzhhoy+vIZRkpEo8 loZardbShi6I/wfiqgrRUW6YEl28CaLF4jQ/EHMifG8dRZBY3IPQg5VBo/NVtIt+AdwY iG2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=6b+r/qO6jTNd+eQdEZK212ydTtWtBK6Hb2cWKKJgo7o=; fh=b0ZeoKNIiT4LQU5BRltdQjIOB6zW2Gt/5Wq87y6SxNA=; b=h70FU72bLwugyPDCM6tPoGImGTSlfSVA5BIX2Od5HQXXC1PGZI3WDSFH2I4GFgKOjB lN4C84YK3JnPaln/h7uF9ylEer3WQc7Y8R1PWUN1QyIwPr6W32z7MIfJkEaGPxWDAmuO jR79/sHQVrkmxojTqyo9IIjiXhYgtlFxSrLF6QqKBZd6xL7Mo01f0lwgnAgr0NLcltdM SjrafUQGdrsIvKkDD/QNtXT9Q0WUdBDpjUzKZUIOOR1n+EAsaI8t2RWghnDtCPQeH1fe HqeHLVrOjPPfH5bsICdtdm8suE7Jdd9o+gieCRVnEp9+KNy9tcYLBZQQZ50FFNWoXn47 UHnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=WROqpbfZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id a16-20020a056a000c9000b0069014d63f21si2443178pfv.148.2023.09.21.14.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 14:20:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=WROqpbfZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 41A00828E0B0; Thu, 21 Sep 2023 13:21:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229545AbjIUUVl (ORCPT + 29 others); Thu, 21 Sep 2023 16:21:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231546AbjIUUVQ (ORCPT ); Thu, 21 Sep 2023 16:21:16 -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 CF7254E5EC for ; Thu, 21 Sep 2023 10:17:21 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id 98e67ed59e1d1-274b4d91172so834048a91.1 for ; Thu, 21 Sep 2023 10:17:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695316641; x=1695921441; 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=WROqpbfZnTgwEOtha9R2oDR7HNUNqAa1qBePPoSRL8GtUVyeZarPnzCyJF1mXY5h/S 5C98P7vm5opFqXSkNqdtJIoklDV4q0WFIgsfVeWOiR/KSwTgTCCf4tB7XptHrHPficvy /qfW971yb16gfIbBYm53oTzcLy1tOAjhG9j9dzZ6C6aSwsCPF03ttpdocxL8yBViT5Y+ zvhFzYcBf29LQ9LoCR7IXnEePLrDMBw2CiGboJRe4hlZppR/wzYOkAhmPOwpGZ3U9ufu lpVcsRvdbKjLata4hW9tChTWhlyK+XbjnAScVRDOk/TBNScvnQ4dYG48E3YnZe3J1+O3 H/2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695316641; x=1695921441; 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=KXUdYO1mkcVT2nNXU+Dm7u5dQgHc9pGfWdLVdXUaGvIJtw41NP3q9DFp8KKQEtPz2O g3XfHBC1adpDzkvTddVatTbPFZVGdKVxd9vU8PtR94xk8JyMIz5lqE2NfWfwmwfFRy9E MwH9yHIBsTiBFEtRvAA1Z8OJmAMYZKiHlW1PJ9/KWtylKZyq0BW2O1FNlv++by9CDEWo ERbppPml3juT/sfG5T9T9AUULfx3MLaioYdEei5HekmKj6D9X2U8Lj3QjqZ/yip8OWsq s3+C8dQcQv6uZMGmf8lUBaTOuv5zsR0zdeZzS7xxA5boZdxeeXdnXBLUE7+RK6/Rls03 jFUA== X-Gm-Message-State: AOJu0Yydg0y/jD/tYRgGarNZHIm8cLHkQP8VhBXr8dRqCfKgzNcGR4Uj 3cVi1Eo3xa05w6DAJKrK6cmzp88= 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 X-Spam-Status: No, score=-7.2 required=5.0 tests=DATE_IN_PAST_06_12, DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 21 Sep 2023 13:21:53 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777683625844806302 X-GMAIL-MSGID: 1777683625844806302 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