Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d0901a3 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by James Morris
Browse files

LSM: Rename security_path_ functions argument names. 



include/linux/security.h and security/capability.c are using "struct path *dir"
but security/security.c was using "struct path *path" by error.
This patch renames "struct path *path" to "struct path *dir".

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 9f59f90b

security/security.c

+15 −15
Original line number Diff line number Diff line
@@ -389,42 +389,42 @@ int security_inode_init_security(struct inode *inode, struct inode *dir, 
EXPORT_SYMBOL(security_inode_init_security);



#ifdef CONFIG_SECURITY_PATH

int security_path_mknod(struct path *path, struct dentry *dentry, int mode,

int security_path_mknod(struct path *dir, struct dentry *dentry, int mode,

			unsigned int dev)

{

	if (unlikely(IS_PRIVATE(path->dentry->d_inode)))

	if (unlikely(IS_PRIVATE(dir->dentry->d_inode)))

		return 0;

	return security_ops->path_mknod(path, dentry, mode, dev);

	return security_ops->path_mknod(dir, dentry, mode, dev);

}

EXPORT_SYMBOL(security_path_mknod);



int security_path_mkdir(struct path *path, struct dentry *dentry, int mode)

int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)

{

	if (unlikely(IS_PRIVATE(path->dentry->d_inode)))

	if (unlikely(IS_PRIVATE(dir->dentry->d_inode)))

		return 0;

	return security_ops->path_mkdir(path, dentry, mode);

	return security_ops->path_mkdir(dir, dentry, mode);

}



int security_path_rmdir(struct path *path, struct dentry *dentry)

int security_path_rmdir(struct path *dir, struct dentry *dentry)

{

	if (unlikely(IS_PRIVATE(path->dentry->d_inode)))

	if (unlikely(IS_PRIVATE(dir->dentry->d_inode)))

		return 0;

	return security_ops->path_rmdir(path, dentry);

	return security_ops->path_rmdir(dir, dentry);

}



int security_path_unlink(struct path *path, struct dentry *dentry)

int security_path_unlink(struct path *dir, struct dentry *dentry)

{

	if (unlikely(IS_PRIVATE(path->dentry->d_inode)))

	if (unlikely(IS_PRIVATE(dir->dentry->d_inode)))

		return 0;

	return security_ops->path_unlink(path, dentry);

	return security_ops->path_unlink(dir, dentry);

}



int security_path_symlink(struct path *path, struct dentry *dentry,

int security_path_symlink(struct path *dir, struct dentry *dentry,

			  const char *old_name)

{

	if (unlikely(IS_PRIVATE(path->dentry->d_inode)))

	if (unlikely(IS_PRIVATE(dir->dentry->d_inode)))

		return 0;

	return security_ops->path_symlink(path, dentry, old_name);

	return security_ops->path_symlink(dir, dentry, old_name);

}



int security_path_link(struct dentry *old_dentry, struct path *new_dir,