Messages in this thread Patch in this message | | | Subject | [PATCH (for 3.15) 5/5] LSM: Remove duplicated rename handling. | From | Tetsuo Handa <> | Date | Mon, 12 May 2014 22:25:54 +0900 |
| |
>From 479d305929c4ef600de99948f42ed633b24458b0 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Date: Mon, 12 May 2014 22:02:30 +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 <penguin-kernel@I-love.SAKURA.ne.jp> --- security/security.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/security/security.c b/security/security.c index 81d7ffe..fbc4968 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.1
| |