Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp5048736pxb; Wed, 26 Jan 2022 03:46:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/YMuSZZqkAhEts7oF96pDz5PEwC+WMLe1b1P07WdohL4oqOskk1Byj+0mSyOxycNey2pO X-Received: by 2002:a17:902:b20f:b0:149:9483:9407 with SMTP id t15-20020a170902b20f00b0014994839407mr22640339plr.54.1643197586975; Wed, 26 Jan 2022 03:46:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643197586; cv=none; d=google.com; s=arc-20160816; b=u1N4ONCi/VWRAL82I8DRtwIwQu+1giOgUYe3B2kSvRiVyJF7eqRI2cJtlQWISgCB/U pK5K2l9WgzLr44MIfEXe91KwEjp/kgWnyLnh1mc3kgLPe8UEkI0AoNze+43XQFLzxPZ3 ZotYM5KEt15om1LTIpsWY4RWNp3Oiv7b4GsBbeMFJ7dVT2NmJ36odYIh44EMjOxDtmY3 yATzqFa1lldyZPmz9Vx24ENNT4D46bgDtMxU9s+hfG5zYCPeRREIAnaN6jRkRURIWpVZ rDtaC960Fl9FKjsjfaDVIedWtcdS21IojQo0VfUkaKPgBNhBfAjB/i7xN2rmeP7KeVzR dW3g== 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=/0ECQlcVfubXyc4fP7Ynu2TP0Hf6uUSHNatGiTkNU+o=; b=XC4iEHCCJW4FHTrqzmvcUDHYwVZmhh4sSakigfnilYo69lsP3kPKxokLn0DJSdQilQ RPU6zQPIHmDiTRfEKmrTBjGWD99Kcg+RJM4Am/aS/ee4wrP6wTwjtwZLLefcF1EwgYQh KPOeFFVhiYJTKLGW5iQKmD1k2s4Yt2C8PG2xfCZOExkawGZWj3a6G+ofLAEdCe1oNA8+ /+tUFdaHOEto3bgFurMF4RkCoc/MCmIvAiac5s+XQcISy2feDYho9Zt2ElxHrMR2Vcs9 RUqfepefY7O6tfEmj0BXeU0z+vCBeeIVb/iAYscd4/mJOYhvV2fNZuEu+TfLeIiZd2Vg H9Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=bYEZsvlL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z14si18353967pgo.442.2022.01.26.03.46.14; Wed, 26 Jan 2022 03:46:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=bYEZsvlL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S234365AbiAYWru (ORCPT + 99 others); Tue, 25 Jan 2022 17:47:50 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:8316 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234196AbiAYWrZ (ORCPT ); Tue, 25 Jan 2022 17:47:25 -0500 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 20PMCPo4032314; Tue, 25 Jan 2022 22:47:01 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=/0ECQlcVfubXyc4fP7Ynu2TP0Hf6uUSHNatGiTkNU+o=; b=bYEZsvlLTWFVXvxCGIXMlM1jf8f+RkhQKQ+kxxP9tiSpFG9Ekv+BIzAfslLigLnBFHvM +TIpzBoOk86FYM/+z7JHb8k8XX+VY6DjimtPD1oUUQVM/9wizML+fJpc86w+9Edu+GtR G/Qst40WfPZbHc7gWtBt0ShHtMhPLTg/fP3A0UJbaaZFLU04q/wdt+M8BauAO9lPTVsc 1EKpyVRx85dTvRj6rS5XpRbxL8UOlGWj1Ag0s3jVburI5OqRLiGvrNMwLHkO/oRZ3jUU tT3H0zLfSF+KFNRlh4odZmRFLPxaAOomavD3OKYM+saWvIIeYT+7MjnWr8XQqvP36FdV aw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3dtssp0hv9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 25 Jan 2022 22:47:01 +0000 Received: from m0098404.ppops.net (m0098404.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 20PMTtZm019705; Tue, 25 Jan 2022 22:47:00 GMT Received: from ppma02dal.us.ibm.com (a.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.10]) by mx0a-001b2d01.pphosted.com with ESMTP id 3dtssp0huv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 25 Jan 2022 22:47:00 +0000 Received: from pps.filterd (ppma02dal.us.ibm.com [127.0.0.1]) by ppma02dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 20PMh2bC011206; Tue, 25 Jan 2022 22:46:59 GMT Received: from b01cxnp22034.gho.pok.ibm.com (b01cxnp22034.gho.pok.ibm.com [9.57.198.24]) by ppma02dal.us.ibm.com with ESMTP id 3dt1x9rg84-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 25 Jan 2022 22:46:59 +0000 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp22034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 20PMkuXa31261096 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Jan 2022 22:46:56 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 817CAAC05B; Tue, 25 Jan 2022 22:46:56 +0000 (GMT) Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 65EF3AC065; Tue, 25 Jan 2022 22:46:56 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP; Tue, 25 Jan 2022 22:46:56 +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 Subject: [PATCH v9 01/23] ima: Remove ima_policy file before directory Date: Tue, 25 Jan 2022 17:46:23 -0500 Message-Id: <20220125224645.79319-2-stefanb@linux.vnet.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220125224645.79319-1-stefanb@linux.vnet.ibm.com> References: <20220125224645.79319-1-stefanb@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: b2Bf-G0i0rgFpgC0nprJUqvxdQDL2EU3 X-Proofpoint-ORIG-GUID: 1gk_JMukCptggD_jRLkAJWE7S_ts_bFo 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-01-25_05,2022-01-25_02,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 phishscore=0 adultscore=0 malwarescore=0 suspectscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 impostorscore=0 clxscore=1015 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2201250135 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Berger 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 --- 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