vfs: define struct filename and have getname() return it

getname() is intended to copy pathname strings from userspace into a
kernel buffer. The result is just a string in kernel space. It would
however be quite helpful to be able to attach some ancillary info to
the string.

For instance, we could attach some audit-related info to reduce the
amount of audit-related processing needed. When auditing is enabled,
we could also call getname() on the string more than once and not
need to recopy it from userspace.

This patchset converts the getname()/putname() interfaces to return
a struct instead of a string. For now, the struct just tracks the
string in kernel space and the original userland pointer for it.

Later, we'll add other information to the struct as it becomes
convenient.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 63e77e3944ce..9eb090582cf1 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -449,7 +449,7 @@ osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags)
 {
         int retval;
         struct cdfs_args tmp;
-        char *devname;
+        struct filename *devname;
 
         retval = -EFAULT;
         if (copy_from_user(&tmp, args, sizeof(tmp)))
@@ -458,7 +458,7 @@ osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags)
         retval = PTR_ERR(devname);
         if (IS_ERR(devname))
                 goto out;
-        retval = do_mount(devname, dirname, "ext2", flags, NULL);
+        retval = do_mount(devname->name, dirname, "ext2", flags, NULL);
         putname(devname);
  out:
         return retval;
@@ -469,7 +469,7 @@ osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags)
 {
         int retval;
         struct cdfs_args tmp;
-        char *devname;
+        struct filename *devname;
 
         retval = -EFAULT;
         if (copy_from_user(&tmp, args, sizeof(tmp)))
@@ -478,7 +478,7 @@ osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags)
         retval = PTR_ERR(devname);
         if (IS_ERR(devname))
                 goto out;
-        retval = do_mount(devname, dirname, "iso9660", flags, NULL);
+        retval = do_mount(devname->name, dirname, "iso9660", flags, NULL);
         putname(devname);
  out:
         return retval;
@@ -499,7 +499,7 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path,
                 int, flag, void __user *, data)
 {
         int retval;
-        char *name;
+        struct filename *name;
 
         name = getname(path);
         retval = PTR_ERR(name);
@@ -507,13 +507,13 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path,
                 goto out;
         switch (typenr) {
         case 1:
-                retval = osf_ufs_mount(name, data, flag);
+                retval = osf_ufs_mount(name->name, data, flag);
                 break;
         case 6:
-                retval = osf_cdfs_mount(name, data, flag);
+                retval = osf_cdfs_mount(name->name, data, flag);
                 break;
         case 9:
-                retval = osf_procfs_mount(name, data, flag);
+                retval = osf_procfs_mount(name->name, data, flag);
                 break;
         default:
                 retval = -EINVAL;