>From fe5ea6a9442c95725d3c27eddfde754acd8c9785 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa <[email protected]> Date: Thu, 24 Apr 2014 20:09:57 +0900 Subject: [PATCH (for 3.15) 5/5] LSM: Remove duplicated rename handling.
Since all LSM modules are now ready to handle the rename flags, security_inode_rename() and security_path_rename() no longer need to call each LSM module with reversed arguments. Signed-off-by: Tetsuo Handa <[email protected]> --- security/security.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/security/security.c b/security/security.c index 65ceef3..96f9437 100644 --- a/security/security.c +++ b/security/security.c @@ -439,15 +439,6 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, if (unlikely(IS_PRIVATE(old_dentry->d_inode) || (new_dentry->d_inode && IS_PRIVATE(new_dentry->d_inode)))) return 0; - - if (flags & RENAME_EXCHANGE) { - int err = security_ops->path_rename(new_dir, new_dentry, - old_dir, old_dentry, - flags); - if (err) - return err; - } - return security_ops->path_rename(old_dir, old_dentry, new_dir, new_dentry, flags); } @@ -540,15 +531,6 @@ int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry, if (unlikely(IS_PRIVATE(old_dentry->d_inode) || (new_dentry->d_inode && IS_PRIVATE(new_dentry->d_inode)))) return 0; - - if (flags & RENAME_EXCHANGE) { - int err = security_ops->inode_rename(new_dir, new_dentry, - old_dir, old_dentry, - flags); - if (err) - return err; - } - return security_ops->inode_rename(old_dir, old_dentry, new_dir, new_dentry, flags); } -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
