From patchwork Tue Jul 11 16:44:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nayna Jain X-Patchwork-Id: 118664 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp630934vqm; Tue, 11 Jul 2023 10:12:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlFMgG8uOgf5SqtgjmP3KAoN1+DghqWvGoJJ6cZfyf4O9Gz1wAwfiC3K2ekndz+Q0GEH2K/f X-Received: by 2002:a17:90a:5884:b0:263:44dd:f85 with SMTP id j4-20020a17090a588400b0026344dd0f85mr15852900pji.24.1689095529654; Tue, 11 Jul 2023 10:12:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689095529; cv=none; d=google.com; s=arc-20160816; b=apiCcwujG4A3BfBJ9VIltbWBnMPKENN+27YqLDm7Rsc5YiG6ZzIrPb6Up0tKXA7z+9 5I//jl86Q3zlYlXgRlq5TOF648UyQyEyvVJs063AVm7hrIc+3cp+kNgERvaOn+vAvTMm qxquwg5v7Lq+rc045UBbe6L81SHw/Jv7uGWZTip8zmiKwrkOcwUx3Sd2LWmmGkYD++zF BxWYr24nIzK//uqRwd1rjLi0mfKQv4hrzy7xQtGDuU6MetB+J9hI3KOoWw53t0GKRe+g eaqHPWSCICBLHIdXdadxxkXsYh6DuP5ceaJ9/ukWtmFhmjxV6Pk/ceHVDXR4Y8xM1ZYy Qw6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=JA8X7Il3lfH0EZNiXLVBlBOW9Ho6VArOtCyCLNslmEA=; fh=m7pbAqQp3guImTC4LlL7j4/o+Nlfvvx8JKQuZoh7UrE=; b=ch66XVG1KCOfVL/lD+G/tWxaziLPr5esbiEuDhTLrjc6/bg8OhbuhiNGcEclEw89En 27raI0SD+Xxa1ePGUeZd5isY3GuijTB2nMM8ti93JO5MtJGcGYqflboq4IINQmCATXkA 4s61U6HImXbdgRMnQgo/b5bUtvnmiHjW1LfaiLjyG6G1ldjw1csZCwXVdvcEoZ6XXZs1 JAztZfM8D3wApzNLP/kvsPFhUs5YRrv4xSBFct6TqvVvo/QbzR6dJlnORRMaX61EGVIu 8nDULyTdcuntc8+6D4yrZ+P8y/B7gTuI6pvfGsmFh6O/gTEEb7ijli/u01d8cOxkUFD/ IjFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=eZ1KWEty; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h21-20020a17090aa89500b002501d633225si9636810pjq.11.2023.07.11.10.11.55; Tue, 11 Jul 2023 10:12:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=eZ1KWEty; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230239AbjGKQsZ (ORCPT + 99 others); Tue, 11 Jul 2023 12:48:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233433AbjGKQsL (ORCPT ); Tue, 11 Jul 2023 12:48:11 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AC7D10F2; Tue, 11 Jul 2023 09:48:10 -0700 (PDT) Received: from pps.filterd (m0353723.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36BGkARF018906; Tue, 11 Jul 2023 16:48:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=JA8X7Il3lfH0EZNiXLVBlBOW9Ho6VArOtCyCLNslmEA=; b=eZ1KWEtyhWkOj0vsNXM9jnECBQupFdmtGSIDTIDY+dSZJw2aTzWyQvGtXPEvc3F49Kyf Ylvz3j1qlvuv3w/qaLRcBP3XZN3Lc2x/0a7Y4TWPKxpY23gql4SJnPDQE6rWaKaWXc6x wkOhnuCRignC+1y3ktaqJ5QHtMXdpXpnw3P2//ejbtwWEBpazuKe3wyCyf+nEOlBK/O9 e1mnZwZOHwcYtAu9JvTwXQsZL3TrvIa0jOrObwnWfHSp8Dw4YeJhVi9qcLSkgnTyk4Zs jZq/zwhcPeQnxKS0OAnizL7/1n7+26gQ9jh5LBvN7c+jSRBCbiRaFp9BWjZ1McV/ZmTo BQ== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rsassre17-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Jul 2023 16:48:02 +0000 Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 36BEFVYI019726; Tue, 11 Jul 2023 16:45:04 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3rqmu0r8vg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Jul 2023 16:45:04 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 36BGj0e558196234 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Jul 2023 16:45:01 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D8BCC20043; Tue, 11 Jul 2023 16:45:00 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3D99520040; Tue, 11 Jul 2023 16:44:59 +0000 (GMT) Received: from li-4b5937cc-25c4-11b2-a85c-cea3a66903e4.ibm.com (unknown [9.61.188.53]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Jul 2023 16:44:59 +0000 (GMT) From: Nayna Jain To: "linux-integrity @ vger . kernel . org" Cc: Mimi Zohar , Linux Kernel Mailing List , linux-security-module , Nayna Jain Subject: [PATCH] ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig Date: Tue, 11 Jul 2023 12:44:47 -0400 Message-Id: <20230711164447.714035-1-nayna@linux.ibm.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: bDpeO9ZNEw97fHm6cuDx17o7ynZEU7pC X-Proofpoint-GUID: bDpeO9ZNEw97fHm6cuDx17o7ynZEU7pC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-11_09,2023-07-11_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 lowpriorityscore=0 impostorscore=0 mlxscore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 mlxlogscore=690 adultscore=0 clxscore=1011 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2307110149 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771145034396982546 X-GMAIL-MSGID: 1771145034396982546 Time to remove "IMA_TRUSTED_KEYRING". Fixes: f4dc37785e9b ("integrity: define '.evm' as a builtin 'trusted' keyring") # v4.5+ Signed-off-by: Nayna Jain --- security/integrity/ima/Kconfig | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index 60a511c6b583..c17660bf5f34 100644 --- a/security/integrity/ima/Kconfig +++ b/security/integrity/ima/Kconfig @@ -248,18 +248,6 @@ config IMA_APPRAISE_MODSIG The modsig keyword can be used in the IMA policy to allow a hook to accept such signatures. -config IMA_TRUSTED_KEYRING - bool "Require all keys on the .ima keyring be signed (deprecated)" - depends on IMA_APPRAISE && SYSTEM_TRUSTED_KEYRING - depends on INTEGRITY_ASYMMETRIC_KEYS - select INTEGRITY_TRUSTED_KEYRING - default y - help - This option requires that all keys added to the .ima - keyring be signed by a key on the system trusted keyring. - - This option is deprecated in favor of INTEGRITY_TRUSTED_KEYRING - config IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY bool "Permit keys validly signed by a built-in or secondary CA cert (EXPERIMENTAL)" depends on SYSTEM_TRUSTED_KEYRING