On 05/12/2014 06:25 AM, Tetsuo Handa wrote:
>>From 479d305929c4ef600de99948f42ed633b24458b0 Mon Sep 17 00:00:00 2001
> From: Tetsuo Handa <penguin-ker...@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-ker...@i-love.sakura.ne.jp>
Acked-by: John Johansen <john.johan...@canonical.com>
> ---
> 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);
> }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
