From patchwork Thu Feb 29 00:54:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fan Wu X-Patchwork-Id: 208124 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp102917dyb; Wed, 28 Feb 2024 17:00:07 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUksymRDhbN9/gZSSbJiVfIKPXlrRNKaPLSWgTwhqWTH/oPmiICeZicbO8j7yLXVTMXwq83XF2+B4crHfUA0dvba4EQaw== X-Google-Smtp-Source: AGHT+IHndZdKeAxyKOm0xewsd+D3r0ZziOGMyzd5YFDL6POrOBaEqJCkCJxzNQDqlmpZYZQjBEMR X-Received: by 2002:a17:90a:d58a:b0:29a:1ad0:632 with SMTP id v10-20020a17090ad58a00b0029a1ad00632mr820972pju.39.1709168407566; Wed, 28 Feb 2024 17:00:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709168407; cv=pass; d=google.com; s=arc-20160816; b=COHxkGo0YSh0SJK3K/tKxD1B/pqaEHrHPkhSeDOTIbgQBfhPl32YAOxsjiAwLpy1cV tUZ49P+l6X+MpRH9E3bEPM28gNDj8EPRlsu53NZdcOlvA+skYwVN5U4rFP6a9KmDhWwG onuey1pulWNyKyMzRDHhBG9Kvy2bNiobS5Vss+qQjOOaPEL0ZMhelN46yh5s7SSOf+9a 6Tfxl0GbV7wJEjHl2rfJI7BkGfLQjSGC0RemLbqzgehXai48eovDclPDSpliIMfSn5TX g+GQ2bTqlpi0kv5a10ACV5Mmq57CSBc4yOrxbn+V8Ox9PyaXWc9i8NJ0tQisNf9G4myB B+VA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-id:precedence:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :dkim-filter; bh=E1OuSZSaokICKhn+FmVzEp1tXTBWcoBKv0avlYzbfkQ=; fh=OyVWwaN4k6amVBbLsUrv/LtzT4uXeXlIwg6oMI9yoyM=; b=MbVCdOUVez6iJyHww/ZrQ0NH5beYbzfhqLzGQmQIJnmGzETrgULYakNt3220MlXij+ vIqeturnXGuaF7fb2//+klieEaKu1jQ+Rf1C+SRNbcnO9hH9EBiHLjkFbgFPN8cMWyBC QxxMdp+hVWnysjh2EevWjSrNcili7yVC6JkzPkWEvSd4jtDiA62IS/8w6ryMKzTEdITt 6or+S5AxhA1fOgh5iRDssR6XM+tlFJACLtYHJqet8pe1GTm/4yfVBxrF55HDSEDg+H9j feZV9LVWVEk7/XphQkIEdjxZcnOvOM+gRu8vkePY2ecoE8ESEF2jeK83g/fTS/XXDE5o 4KhA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=mGYDI7uY; arc=pass (i=1 spf=pass spfdomain=linux.microsoft.com dkim=pass dkdomain=linux.microsoft.com dmarc=pass fromdomain=linux.microsoft.com); spf=pass (google.com: domain of linux-kernel+bounces-85949-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85949-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id lw5-20020a17090b180500b0029b02a58a7fsi384591pjb.10.2024.02.28.17.00.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 17:00:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-85949-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=mGYDI7uY; arc=pass (i=1 spf=pass spfdomain=linux.microsoft.com dkim=pass dkdomain=linux.microsoft.com dmarc=pass fromdomain=linux.microsoft.com); spf=pass (google.com: domain of linux-kernel+bounces-85949-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-85949-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 4DA072896D7 for ; Thu, 29 Feb 2024 01:00:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9FABB51C4F; Thu, 29 Feb 2024 00:55:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="mGYDI7uY" Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EFBCF2E644; Thu, 29 Feb 2024 00:55:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709168126; cv=none; b=oSCqrx0DTLvcBfbe3MdxkOFP7avFAbI09OiI6qSC2gKuFvuf3U5iD3Q2JFTgaRhAyWODhLCmHQy2tRSbwPrQagnhjA7/K3bq4YeGgBFyTrm2DvQRdJfyhAgsRn4qqIF84y1L/LdQrqwJX0AGfKCuxe3neofO3rDnLcoF8jzU7EA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709168126; c=relaxed/simple; bh=2A+DXjwEJJi7aKY/CFAlV71nJEqDfLJcHOOVwKIVAe0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=TGIxWTI799X6bayd1/zf4VpbXoI/nzvJSXDbhNTYHGoemOMrcNP8YjCTjW7MnoXwkBDJoCdQoSMVBQsHFQIy9kG+uuH0L9zgpdfAqEAmEWoGWldB+YRuaK11iwwCmXU0CCfwj0F0OdLDPVoSJsPWBuWKKoK0jGgwHTVCN669af4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=mGYDI7uY; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Received: by linux.microsoft.com (Postfix, from userid 1052) id C583020B74CD; Wed, 28 Feb 2024 16:55:18 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com C583020B74CD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1709168118; bh=E1OuSZSaokICKhn+FmVzEp1tXTBWcoBKv0avlYzbfkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mGYDI7uYsiryGkUmnFuKzdlzqQANNmc+HLkDROAGqfRacLnrMQrsTFE4pAnJLTHOm rRry7ucrVvuZI+4xU0k0CItaZmVQlVeJ7+osBnCceXtPqPakMacqARfiml1dj2tdsl zrJ+eCLw7uaEAaOu/j2bxG15+gOFZeVsMZ2bSFH4= From: Fan Wu To: corbet@lwn.net, zohar@linux.ibm.com, jmorris@namei.org, serge@hallyn.com, tytso@mit.edu, ebiggers@kernel.org, axboe@kernel.dk, agk@redhat.com, snitzer@kernel.org, eparis@redhat.com, paul@paul-moore.com Cc: linux-doc@vger.kernel.org, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-fscrypt@vger.kernel.org, linux-block@vger.kernel.org, dm-devel@lists.linux.dev, audit@vger.kernel.org, linux-kernel@vger.kernel.org, Fan Wu Subject: [RFC PATCH v13 07/20] security: add new securityfs delete function Date: Wed, 28 Feb 2024 16:54:49 -0800 Message-Id: <1709168102-7677-8-git-send-email-wufan@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1709168102-7677-1-git-send-email-wufan@linux.microsoft.com> References: <1709168102-7677-1-git-send-email-wufan@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792192972178500121 X-GMAIL-MSGID: 1792192972178500121 When deleting a directory in the security file system, the existing securityfs_remove requires the directory to be empty, otherwise it will do nothing. This leads to a potential risk that the security file system might be in an unclean state when the intended deletion did not happen. This commit introduces a new function securityfs_recursive_remove to recursively delete a directory without leaving an unclean state. Co-developed-by: Christian Brauner (Microsoft) Signed-off-by: Fan Wu --- v1-v8: + Not present v9: + Introduced v10: + No changes v11: + Fix code style issues v12: + No changes v13: + No changes --- include/linux/security.h | 1 + security/inode.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/linux/security.h b/include/linux/security.h index 619e17e59532..e74e8b2a07f4 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -2029,6 +2029,7 @@ struct dentry *securityfs_create_symlink(const char *name, const char *target, const struct inode_operations *iops); extern void securityfs_remove(struct dentry *dentry); +extern void securityfs_recursive_remove(struct dentry *dentry); #else /* CONFIG_SECURITYFS */ diff --git a/security/inode.c b/security/inode.c index 9e7cde913667..f21847badb7d 100644 --- a/security/inode.c +++ b/security/inode.c @@ -313,6 +313,31 @@ void securityfs_remove(struct dentry *dentry) } EXPORT_SYMBOL_GPL(securityfs_remove); +static void remove_one(struct dentry *victim) +{ + simple_release_fs(&mount, &mount_count); +} + +/** + * securityfs_recursive_remove - recursively removes a file or directory + * + * @dentry: a pointer to a the dentry of the file or directory to be removed. + * + * This function recursively removes a file or directory in securityfs that was + * previously created with a call to another securityfs function (like + * securityfs_create_file() or variants thereof.) + */ +void securityfs_recursive_remove(struct dentry *dentry) +{ + if (IS_ERR_OR_NULL(dentry)) + return; + + simple_pin_fs(&fs_type, &mount, &mount_count); + simple_recursive_removal(dentry, remove_one); + simple_release_fs(&mount, &mount_count); +} +EXPORT_SYMBOL_GPL(securityfs_recursive_remove); + #ifdef CONFIG_SECURITY static struct dentry *lsm_dentry; static ssize_t lsm_read(struct file *filp, char __user *buf, size_t count,