fs: add do_linkat() helper and ksys_link() wrapper; remove in-kernel calls to syscall

Using the fs-internal do_linkat() helper allows us to get rid of
fs-internal calls to the sys_linkat() syscall.

Introducing the ksys_link() wrapper allows us to avoid the in-kernel
calls to sys_link() syscall. The ksys_ prefix denotes that this function
is meant as a drop-in replacement for the syscall. In particular, it uses
the same calling convention as sys_link().

In the near future, the only fs-external user of ksys_link() should be
converted to use vfs_link() instead.

This patch is part of a series which removes in-kernel calls to syscalls.
On this basis, the syscall entry path can be streamlined. For details, see
http://lkml.kernel.org/r/20180325162527.GA17492@light.dominikbrodowski.net

Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

diff --git a/fs/internal.h b/fs/internal.h
index 4f0b67054c54c46846ce2c74c5a2dcf735cc112f..91e6fc93fcb5b8aef5b3867514f616d33fd3b347 100644 (file)
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -62,6 +62,8 @@ long do_rmdir(int dfd, const char __user *pathname);
 long do_unlinkat(int dfd, struct filename *name);
 long do_symlinkat(const char __user *oldname, int newdfd,
                  const char __user *newname);
+int do_linkat(int olddfd, const char __user *oldname, int newdfd,
+             const char __user *newname, int flags);
 
 /*
  * namespace.c

diff --git a/fs/namei.c b/fs/namei.c
index 8459a18cdd18a062bc1d6f4325493df429f3098e..10148235829f7d3fbac2b10c5b2e1e9f65b7374c 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -4250,8 +4250,8 @@ EXPORT_SYMBOL(vfs_link);
  * with linux 2.0, and to avoid hard-linking to directories
  * and other special files.  --ADM
  */
-SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
-               int, newdfd, const char __user *, newname, int, flags)
+int do_linkat(int olddfd, const char __user *oldname, int newdfd,
+             const char __user *newname, int flags)
 {
        struct dentry *new_dentry;
        struct path old_path, new_path;
@@ -4315,9 +4315,15 @@ out:
        return error;
 }
 
+SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
+               int, newdfd, const char __user *, newname, int, flags)
+{
+       return do_linkat(olddfd, oldname, newdfd, newname, flags);
+}
+
 SYSCALL_DEFINE2(link, const char __user *, oldname, const char __user *, newname)
 {
-       return sys_linkat(AT_FDCWD, oldname, AT_FDCWD, newname, 0);
+       return do_linkat(AT_FDCWD, oldname, AT_FDCWD, newname, 0);
 }
 
 /**

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 0b4fd684f0f1ec8a09dc06597a7098a671f2e2e8..827ed917630cab98cb96540d1a29932572a4943b 100644 (file)
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -997,4 +997,13 @@ static inline long ksys_mknod(const char __user *filename, umode_t mode,
        return do_mknodat(AT_FDCWD, filename, mode, dev);
 }
 
+extern int do_linkat(int olddfd, const char __user *oldname, int newdfd,
+                    const char __user *newname, int flags);
+
+static inline long ksys_link(const char __user *oldname,
+                            const char __user *newname)
+{
+       return do_linkat(AT_FDCWD, oldname, AT_FDCWD, newname, 0);
+}
+
 #endif

diff --git a/init/initramfs.c b/init/initramfs.c
index 2972ed0ab3994ec7ebaa19de77eefa484dc6dd75..5855ab632b4e0a37ae0f012ee0888cb91c9cb744 100644 (file)
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -306,7 +306,7 @@ static int __init maybe_link(void)
        if (nlink >= 2) {
                char *old = find_link(major, minor, ino, mode, collected);
                if (old)
-                       return (sys_link(old, collected) < 0) ? -1 : 1;
+                       return (ksys_link(old, collected) < 0) ? -1 : 1;
        }
        return 0;
 }