Commit b873498f authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

init: add an init_chown helper 



Add a simple helper to chown with a kernel space file name and switch
the early init code over to it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 4b7ca501

fs/init.c

+18 −0
Original line number Diff line number Diff line
@@ -78,6 +78,24 @@ int __init init_chroot(const char *filename) 
	return error;

}



int __init init_chown(const char *filename, uid_t user, gid_t group, int flags)

{

	int lookup_flags = (flags & AT_SYMLINK_NOFOLLOW) ? 0 : LOOKUP_FOLLOW;

	struct path path;

	int error;



	error = kern_path(filename, lookup_flags, &path);

	if (error)

		return error;

	error = mnt_want_write(path.mnt);

	if (!error) {

		error = chown_common(&path, user, group);

		mnt_drop_write(path.mnt);

	}

	path_put(&path);

	return error;

}



int __init init_unlink(const char *pathname)

{

	return do_unlinkat(AT_FDCWD, getname_kernel(pathname));

fs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ long do_sys_ftruncate(unsigned int fd, loff_t length, int small); 
int do_fchmodat(int dfd, const char __user *filename, umode_t mode);

int do_fchownat(int dfd, const char __user *filename, uid_t user, gid_t group,

		int flag);



int chown_common(const struct path *path, uid_t user, gid_t group);

extern int vfs_open(const struct path *, struct file *);



/*

fs/open.c

+1 −1
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ SYSCALL_DEFINE2(chmod, const char __user *, filename, umode_t, mode) 
	return do_fchmodat(AT_FDCWD, filename, mode);

}



static int chown_common(const struct path *path, uid_t user, gid_t group)

int chown_common(const struct path *path, uid_t user, gid_t group)

{

	struct inode *inode = path->dentry->d_inode;

	struct inode *delegated_inode = NULL;

include/linux/init_syscalls.h

+1 −0
Original line number Diff line number Diff line
@@ -5,5 +5,6 @@ int __init init_mount(const char *dev_name, const char *dir_name, 
int __init init_umount(const char *name, int flags);

int __init init_chdir(const char *filename);

int __init init_chroot(const char *filename);

int __init init_chown(const char *filename, uid_t user, gid_t group, int flags);

int __init init_unlink(const char *pathname);

int __init init_rmdir(const char *pathname);

init/initramfs.c

+3 −3
Original line number Diff line number Diff line
@@ -349,14 +349,14 @@ static int __init do_name(void) 
		}

	} else if (S_ISDIR(mode)) {

		ksys_mkdir(collected, mode);

		ksys_chown(collected, uid, gid);

		init_chown(collected, uid, gid, 0);

		ksys_chmod(collected, mode);

		dir_add(collected, mtime);

	} else if (S_ISBLK(mode) || S_ISCHR(mode) ||

		   S_ISFIFO(mode) || S_ISSOCK(mode)) {

		if (maybe_link() == 0) {

			ksys_mknod(collected, mode, rdev);

			ksys_chown(collected, uid, gid);

			init_chown(collected, uid, gid, 0);

			ksys_chmod(collected, mode);

			do_utime(collected, mtime);

		}
@@ -393,7 +393,7 @@ static int __init do_symlink(void) 
	collected[N_ALIGN(name_len) + body_len] = '\0';

	clean_path(collected, 0);

	ksys_symlink(collected + N_ALIGN(name_len), collected);

	ksys_lchown(collected, uid, gid);

	init_chown(collected, uid, gid, AT_SYMLINK_NOFOLLOW);

	do_utime(collected, mtime);

	state = SkipIt;

	next_state = Reset;