diff mbox series

[22/22] apparmorfs: don't duplicate kfree_link()

Message ID	20231220053331.GU1674809@ZenIV (mailing list archive)
State	New, archived
Headers	show Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [62.89.141.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9FE13156DD for <linux-fsdevel@vger.kernel.org>; Wed, 20 Dec 2023 05:33:33 +0000 (UTC) Date: Wed, 20 Dec 2023 05:33:31 +0000 From: Al Viro <viro@zeniv.linux.org.uk> To: linux-fsdevel@vger.kernel.org Cc: apparmor@lists.ubuntu.com Subject: [PATCH 22/22] apparmorfs: don't duplicate kfree_link() Message-ID: <20231220053331.GU1674809@ZenIV> References: <20231220051348.GY1674809@ZenIV> Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231220051348.GY1674809@ZenIV> Sender: Al Viro <viro@ftp.linux.org.uk>
Series	PATCH 01/22] hostfs: use d_splice_alias() calling conventions to simplify failure exits \| expand PATCH 01/22] hostfs: use d_splice_alias() calling conventions to simplify failure exits [02/22] /proc/sys: use d_splice_alias() calling conventions to simplify failure exits [03/22] zonefs: d_splice_alias() will do the right thing on ERR_PTR() inode [04/22] udf: d_splice_alias() will do the right thing on ERR_PTR() inode [05/22] affs: d_obtain_alias(ERR_PTR(...)) will do the right thing [06/22] befs: d_obtain_alias(ERR_PTR(...)) will do the right thing [07/22] ceph: d_obtain_{alias,root}(ERR_PTR(...)) will do the right thing [08/22] gfs2: d_obtain_alias(ERR_PTR(...)) will do the right thing [09/22] kernfs: d_obtain_alias(NULL) will do the right thing... [11/22] udf: d_obtain_alias(ERR_PTR(...)) will do the right thing... [12/22] ext4_add_entry(): ->d_name.len is never 0 [13/22] bfs_add_entry(): get rid of pointless ->d_name.len checks [14/22] __ocfs2_add_entry(), ocfs2_prepare_dir_for_insert(): namelen checks [15/22] reiserfs_add_entry(): get rid of pointless namelen checks [16/22] udf_fiiter_add_entry(): check for zero ->d_name.len is bogus... [17/22] get rid of passing callbacks to ceph __dentry_leases_walk() [18/22] nfsd: kill stale comment about simple_fill_super() requirements [19/22] ocfs2_find_match(): there's no such thing as NULL or negative ->d_parent [20/22] gfs2: use is_subdir() [21/22] orangefs: saner arguments passing in readdir guts [22/22] apparmorfs: don't duplicate kfree_link()

Commit Message

Al Viro Dec. 20, 2023, 5:33 a.m. UTC

rawdata_link_cb() is identical to it

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 security/apparmor/apparmorfs.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff mbox series

Patch

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 38650e52ef57..63ca77103de9 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -1615,11 +1615,6 @@  static char *gen_symlink_name(int depth, const char *dirname, const char *fname)
 	return buffer;
 }
 
-static void rawdata_link_cb(void *arg)
-{
-	kfree(arg);
-}
-
 static const char *rawdata_get_link_base(struct dentry *dentry,
 					 struct inode *inode,
 					 struct delayed_call *done,
@@ -1643,7 +1638,7 @@  static const char *rawdata_get_link_base(struct dentry *dentry,
 	if (IS_ERR(target))
 		return target;
 
-	set_delayed_call(done, rawdata_link_cb, target);
+	set_delayed_call(done, kfree_link, target);
 
 	return target;
 }