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

Commit e3f20ae2 authored by Al Viro's avatar Al Viro
Browse files

security_file_open(): lose cred argument 



Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ae2bb293

fs/open.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/security.h

+2 −3
Original line number Diff line number Diff line
@@ -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;

}

security/security.c

+2 −2
Original line number Diff line number Diff line
@@ -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;