Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Al Viro <viro@zeniv.linux.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org
Subject: [PATCH 14/21] init: add an init_chmod helper
Date: Sun, 26 Jul 2020 09:13:49 +0200 [thread overview]
Message-ID: <20200726071356.287160-15-hch@lst.de> (raw)
In-Reply-To: <20200726071356.287160-1-hch@lst.de>
Add a simple helper to chmod with a kernel space file name and switch
the early init code over to it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/for_init.c | 13 +++++++++++++
fs/internal.h | 2 +-
fs/open.c | 4 ++--
include/linux/init_syscalls.h | 1 +
include/linux/syscalls.h | 7 -------
init/initramfs.c | 4 ++--
6 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/fs/for_init.c b/fs/for_init.c
index 0541851d86f42e..098e9b69c32ef6 100644
--- a/fs/for_init.c
+++ b/fs/for_init.c
@@ -92,6 +92,19 @@ int __init init_chown(const char *filename, uid_t user, gid_t group, int flags)
return error;
}
+int __init init_chmod(const char *filename, umode_t mode)
+{
+ struct path path;
+ int error;
+
+ error = kern_path(filename, LOOKUP_FOLLOW, &path);
+ if (error)
+ return error;
+ error = chmod_common(&path, mode);
+ path_put(&path);
+ return error;
+}
+
int __init init_unlink(const char *pathname)
{
return do_unlinkat(AT_FDCWD, getname_kernel(pathname));
diff --git a/fs/internal.h b/fs/internal.h
index e81b9e23c3ea3f..6d82681c7d8372 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -131,7 +131,7 @@ extern struct open_how build_open_how(int flags, umode_t mode);
extern int build_open_flags(const struct open_how *how, struct open_flags *op);
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 chmod_common(const struct path *path, 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);
diff --git a/fs/open.c b/fs/open.c
index 49960a1248f14b..7ba89eae46c560 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -563,7 +563,7 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
return error;
}
-static int chmod_common(const struct path *path, umode_t mode)
+int chmod_common(const struct path *path, umode_t mode)
{
struct inode *inode = path->dentry->d_inode;
struct inode *delegated_inode = NULL;
@@ -610,7 +610,7 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd, umode_t, mode)
return err;
}
-int do_fchmodat(int dfd, const char __user *filename, umode_t mode)
+static int do_fchmodat(int dfd, const char __user *filename, umode_t mode)
{
struct path path;
int error;
diff --git a/include/linux/init_syscalls.h b/include/linux/init_syscalls.h
index 0da59d76133e17..2b1b4dc586825f 100644
--- a/include/linux/init_syscalls.h
+++ b/include/linux/init_syscalls.h
@@ -6,5 +6,6 @@ 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_chmod(const char *filename, umode_t mode);
int __init init_unlink(const char *pathname);
int __init init_rmdir(const char *pathname);
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index e89d62e944dc0e..8b71fa321ca20c 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -1304,13 +1304,6 @@ static inline long ksys_link(const char __user *oldname,
return do_linkat(AT_FDCWD, oldname, AT_FDCWD, newname, 0);
}
-extern int do_fchmodat(int dfd, const char __user *filename, umode_t mode);
-
-static inline int ksys_chmod(const char __user *filename, umode_t mode)
-{
- return do_fchmodat(AT_FDCWD, filename, mode);
-}
-
long do_faccessat(int dfd, const char __user *filename, int mode, int flags);
static inline long ksys_access(const char __user *filename, int mode)
diff --git a/init/initramfs.c b/init/initramfs.c
index 919b40fb07bada..f2ec2f024f9e67 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -347,14 +347,14 @@ static int __init do_name(void)
} else if (S_ISDIR(mode)) {
ksys_mkdir(collected, mode);
init_chown(collected, uid, gid, 0);
- ksys_chmod(collected, mode);
+ init_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);
init_chown(collected, uid, gid, 0);
- ksys_chmod(collected, mode);
+ init_chmod(collected, mode);
do_utime(collected, mtime);
}
}
--
2.27.0
next prev parent reply other threads:[~2020-07-26 7:15 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-26 7:13 add file system helpers that take kernel pointers for the init code v3 Christoph Hellwig
2020-07-26 7:13 ` [PATCH 01/21] fs: refactor do_mount Christoph Hellwig
2020-07-26 7:13 ` [PATCH 02/21] fs: refactor ksys_umount Christoph Hellwig
2020-07-26 7:13 ` [PATCH 03/21] fs: push the getname from do_rmdir into the callers Christoph Hellwig
2020-07-26 7:13 ` [PATCH 04/21] devtmpfs: refactor devtmpfsd() Christoph Hellwig
2020-07-26 7:43 ` Greg Kroah-Hartman
2020-07-26 8:21 ` Christoph Hellwig
2020-07-26 7:13 ` [PATCH 05/21] init: initialize ramdisk_execute_command at compile time Christoph Hellwig
2020-07-26 7:13 ` [PATCH 06/21] init: mark create_dev as __init Christoph Hellwig
2020-07-26 7:13 ` [PATCH 07/21] init: add an init_mount helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 08/21] init: add an init_umount helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 09/21] init: add an init_unlink helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 10/21] init: add an init_rmdir helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 11/21] init: add an init_chdir helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 12/21] init: add an init_chroot helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 13/21] init: add an init_chown helper Christoph Hellwig
2020-07-26 7:13 ` Christoph Hellwig [this message]
2020-07-26 7:13 ` [PATCH 15/21] init: add an init_eaccess helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 16/21] init: add an init_link helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 17/21] init: add an init_symlink helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 18/21] init: add an init_mkdir helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 19/21] init: add an init_mknod helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 20/21] init: add an init_stat helper Christoph Hellwig
2020-07-26 7:13 ` [PATCH 21/21] init: add an init_utimes helper Christoph Hellwig
2020-07-26 15:49 ` add file system helpers that take kernel pointers for the init code v3 Linus Torvalds
2020-07-26 15:52 ` Christoph Hellwig
2020-07-26 16:21 ` Al Viro
2020-07-26 16:24 ` Christoph Hellwig
2020-07-26 16:26 ` Christoph Hellwig
2020-07-26 16:33 ` Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200726071356.287160-15-hch@lst.de \
--to=hch@lst.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
--subject='Re: [PATCH 14/21] init: add an init_chmod helper' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).