security_file_open(): lose cred argument

Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/open.c b/fs/open.c
index 0a9f00b7f3d527af0fc131b06a719b91205670b3..4c65edefa48723024904a4ea8f95bbc4a9cc4c0a 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -776,7 +776,7 @@ static int do_dentry_open(struct file *f,
                goto cleanup_all;
        }
 
-       error = security_file_open(f, f->f_cred);
+       error = security_file_open(f);
        if (error)
                goto cleanup_all;
 

diff --git a/include/linux/security.h b/include/linux/security.h
index 63030c85ee1927ae0de30a07148fa511e19231aa..88d30fc975e74de87422011d2554ce74298fec94 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -309,7 +309,7 @@ void security_file_set_fowner(struct file *file);
 int security_file_send_sigiotask(struct task_struct *tsk,
                                 struct fown_struct *fown, int sig);
 int security_file_receive(struct file *file);
-int security_file_open(struct file *file, const struct cred *cred);
+int security_file_open(struct file *file);
 int security_task_alloc(struct task_struct *task, unsigned long clone_flags);
 void security_task_free(struct task_struct *task);
 int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);
@@ -858,8 +858,7 @@ static inline int security_file_receive(struct file *file)
        return 0;
 }
 
-static inline int security_file_open(struct file *file,
-                                    const struct cred *cred)
+static inline int security_file_open(struct file *file)
 {
        return 0;
 }

diff --git a/security/security.c b/security/security.c
index 68f46d849abea30d148dac3942d833c8ef80e114..235b35f58a65b869d861de647af7b51eca870537 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -970,11 +970,11 @@ int security_file_receive(struct file *file)
        return call_int_hook(file_receive, 0, file);
 }
 
-int security_file_open(struct file *file, const struct cred *cred)
+int security_file_open(struct file *file)
 {
        int ret;
 
-       ret = call_int_hook(file_open, 0, file, cred);
+       ret = call_int_hook(file_open, 0, file, file->f_cred);
        if (ret)
                return ret;