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

Commit 6de37b6d authored by Al Viro's avatar Al Viro
Browse files

pass creds to get_empty_filp(), make sure dentry_open() passes the right creds 



... and rename get_empty_filp() to alloc_empty_file().

dentry_open() gets creds as argument, but the only thing that sees those is
security_file_open() - file->f_cred still ends up with current_cred().  For
almost all callers it's the same thing, but there are several broken cases.

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

fs/file_table.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -101,9 +101,8 @@ int proc_nr_files(struct ctl_table *table, int write, 
 * done, you will imbalance int the mount's writer count

 * done, you will imbalance int the mount's writer count

 * and a warning at __fput() time.

 * and a warning at __fput() time.

 */

 */

struct file *get_empty_filp(void)

struct file *alloc_empty_file(const struct cred *cred)

{

{

	const struct cred *cred = current_cred();

	static long old_max;

	static long old_max;

	struct file *f;

	struct file *f;

	int error;

	int error;
@@ -161,7 +160,7 @@ struct file *alloc_file(const struct path *path, int flags, 
{

{

	struct file *file;

	struct file *file;





	file = get_empty_filp();

	file = alloc_empty_file(current_cred());

	if (IS_ERR(file))

	if (IS_ERR(file))

		return file;

		return file;

fs/internal.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ extern void chroot_fs_refs(const struct path *, const struct path *); 
/*

/*

 * file_table.c

 * file_table.c

 */

 */

extern struct file *get_empty_filp(void);

extern struct file *alloc_empty_file(const struct cred *);





/*

/*

 * super.c

 * super.c

fs/namei.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3513,7 +3513,7 @@ static struct file *path_openat(struct nameidata *nd, 
	int opened = 0;

	int opened = 0;

	int error;

	int error;





	file = get_empty_filp();

	file = alloc_empty_file(current_cred());

	if (IS_ERR(file))

	if (IS_ERR(file))

		return file;

		return file;

fs/open.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -921,7 +921,7 @@ struct file *dentry_open(const struct path *path, int flags, 
	/* We must always pass in a valid mount pointer. */

	/* We must always pass in a valid mount pointer. */

	BUG_ON(!path->mnt);

	BUG_ON(!path->mnt);





	f = get_empty_filp();

	f = alloc_empty_file(cred);

	if (!IS_ERR(f)) {

	if (!IS_ERR(f)) {

		f->f_flags = flags;

		f->f_flags = flags;

		error = vfs_open(path, f, cred);

		error = vfs_open(path, f, cred);