Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp1218740pxb; Tue, 1 Feb 2022 22:53:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJyONBZgVystHY8qFE23OPTFkNc980K54sZBDyuHBYRfRLeumlXgeRD3sa9PJTmxZsCR4Ts+ X-Received: by 2002:a17:90b:3141:: with SMTP id ip1mr6572023pjb.161.1643784822303; Tue, 01 Feb 2022 22:53:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643784822; cv=none; d=google.com; s=arc-20160816; b=uJgpDQ0QTsYau/5o+psNmzZHqOr5ggkmNnUAJ4uRTCtb9HC4B/5G9jgYgdjO6mWsmX D4nxK8wgCU7uq88333uWr/Em3BxhMHMMPYRveL2JIS+M9FgMnVQIvm+hcJc7Xrdymn2C hHMkXh8iTiQ2TZHYsRiQK3I3jVlQYkVmgAG7vg0ZVnDuaMd97p2Go1Gl98L8yoLKfO3D LXP0SQGcZgBW3Qa/Ly4jXDfNbicsweZ8svbsNajkvOIF7Qmm2j5ZKu0lll7EsBWGFjY7 kOGrGSndXQojZ8IncE+uR57P1FAR7VIKj6dJWba0O42uatWbSeQucy5AL6CqTGeoeMxC MJuQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=docaiQaRScuNFUeCtKgMtoAWgIf14WkLAx1tk/lMGcw=; b=ed7xo3GzT5cO6NjhMvhLvQHtPWCUgRdWKSbxrVDA/lNtgCZNSUM5iebdJ6blf0xaca ZeDhn3eppguBzxqLvNYX9gWpWBmTBpLyaNQ5ou82eV/1K2+Vd1g53BpIIGikRgeZr1In 9f3IjStoUaf7+Vs93o2Btuwe+u2976lf3Tgp72+9x8twygJKlxKKA/EeYUCOsKw9A6om jmVM1UOmDZKXAci5Oit05YWhTT0eQt7RPwRvGbi+hXmrtRIJN341EX0GlKeLaR5cIzzO +e43RDFslbrqC+SUPM85o+ri6Hx0O07gCBRlHotH9u0PoJg3V3AyILMLiE5qTjbj+JiB rFAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b="G/6vOfp3"; 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=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j69si17863137pgd.507.2022.02.01.22.53.30; Tue, 01 Feb 2022 22:53:42 -0800 (PST) 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="G/6vOfp3"; 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=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241170AbiBAUiZ (ORCPT + 99 others); Tue, 1 Feb 2022 15:38:25 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:36292 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239687AbiBAUiL (ORCPT ); Tue, 1 Feb 2022 15:38:11 -0500 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 211Iqtr4010908; Tue, 1 Feb 2022 20:37:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=docaiQaRScuNFUeCtKgMtoAWgIf14WkLAx1tk/lMGcw=; b=G/6vOfp3esD1Rb0I2selzhLwogw76Qm501JZP012Ld2sDbX2hX+WlRQAKrgqgqmsLE8Z vPPuArYARm7S4S2p6mbBCbdrKff5BO3VJRkxzd26hKxlxPRsbYg4BlPWXkU7liKWjZQ8 xVchRzvL9Lh9Heaxo1gXfIoD8bwlNRdb75AcTqZ0BocEhN3QmnIyqW1+zifY0pMHcZpF lXM3fLREwOOWrRVMmRe4O6DT8Vi82Bw9WOz+Xn+zWPEGx6/eQK2LiyMetYXVXx0M4tA9 hisX+zm19rV2RydCUtm0XxTLyYAHlNM4/pktcszuwSRNVDxx8lSidBddLa2cf0oLwXsR ag== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3dyahg9sjg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 01 Feb 2022 20:37:52 +0000 Received: from m0098409.ppops.net (m0098409.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 211KRY53031010; Tue, 1 Feb 2022 20:37:51 GMT Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0a-001b2d01.pphosted.com with ESMTP id 3dyahg9sj0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 01 Feb 2022 20:37:51 +0000 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 211KWet2027292; Tue, 1 Feb 2022 20:37:50 GMT Received: from b01cxnp22033.gho.pok.ibm.com (b01cxnp22033.gho.pok.ibm.com [9.57.198.23]) by ppma01dal.us.ibm.com with ESMTP id 3dvw7bq199-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 01 Feb 2022 20:37:50 +0000 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 211Kbn5v14746098 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 1 Feb 2022 20:37:49 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 35F2AB2065; Tue, 1 Feb 2022 20:37:49 +0000 (GMT) Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 18C8FB2068; Tue, 1 Feb 2022 20:37:49 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP; Tue, 1 Feb 2022 20:37:49 +0000 (GMT) From: Stefan Berger To: linux-integrity@vger.kernel.org Cc: zohar@linux.ibm.com, serge@hallyn.com, christian.brauner@ubuntu.com, containers@lists.linux.dev, dmitry.kasatkin@gmail.com, ebiederm@xmission.com, krzysztof.struczynski@huawei.com, roberto.sassu@huawei.com, mpeters@redhat.com, lhinds@redhat.com, lsturman@redhat.com, puiterwi@redhat.com, jejb@linux.ibm.com, jamjoom@us.ibm.com, linux-kernel@vger.kernel.org, paul@paul-moore.com, rgb@redhat.com, linux-security-module@vger.kernel.org, jmorris@namei.org, Stefan Berger , Christian Brauner Subject: [PATCH v10 01/27] ima: Remove ima_policy file before directory Date: Tue, 1 Feb 2022 15:37:09 -0500 Message-Id: <20220201203735.164593-2-stefanb@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201203735.164593-1-stefanb@linux.ibm.com> References: <20220201203735.164593-1-stefanb@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: nF8Da3rOHEwSfDigqvLyF8zSQb6y2C6m X-Proofpoint-GUID: 5PsNALJ2zcISCPvNFOAHkkrB_fH2wfKN X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-01_09,2022-02-01_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 clxscore=1015 suspectscore=0 malwarescore=0 lowpriorityscore=0 spamscore=0 phishscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202010114 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The removal of ima_dir currently fails since ima_policy still exists, so remove the ima_policy file before removing the directory. Fixes: 4af4662fa4a9 ("integrity: IMA policy") Signed-off-by: Stefan Berger Acked-by: Christian Brauner --- security/integrity/ima/ima_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c index 3d8e9d5db5aa..3ad8f7734208 100644 --- a/security/integrity/ima/ima_fs.c +++ b/security/integrity/ima/ima_fs.c @@ -496,12 +496,12 @@ int __init ima_fs_init(void) return 0; out: + securityfs_remove(ima_policy); securityfs_remove(violations); securityfs_remove(runtime_measurements_count); securityfs_remove(ascii_runtime_measurements); securityfs_remove(binary_runtime_measurements); securityfs_remove(ima_symlink); securityfs_remove(ima_dir); - securityfs_remove(ima_policy); return -1; } -- 2.31.1