From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Aneesh Kumar K.V" Subject: [PATCH -V4 2/6] vfs: Add name to file handle conversion support Date: Fri, 23 Apr 2010 17:08:31 +0530 Message-ID: <1272022715-11716-3-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1272022715-11716-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Cc: linux-fsdevel@vger.kernel.org, sfrench@us.ibm.com, "Aneesh Kumar K.V" To: hch@infradead.org, viro@zeniv.linux.org.uk, adilger@sun.com, corbet@lwn.net, serue@us.ibm.com Return-path: Received: from e23smtp04.au.ibm.com ([202.81.31.146]:34070 "EHLO e23smtp04.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757171Ab0DWLiv (ORCPT ); Fri, 23 Apr 2010 07:38:51 -0400 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp04.au.ibm.com (8.14.3/8.13.1) with ESMTP id o3NBYsrf029958 for ; Fri, 23 Apr 2010 21:34:54 +1000 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o3NBWBYh1724548 for ; Fri, 23 Apr 2010 21:32:11 +1000 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o3NBcmZD017177 for ; Fri, 23 Apr 2010 21:38:49 +1000 In-Reply-To: <1272022715-11716-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Signed-off-by: Aneesh Kumar K.V --- fs/open.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 19 ++++++++++ 2 files changed, 114 insertions(+), 0 deletions(-) diff --git a/fs/open.c b/fs/open.c index 74e5cd9..dd27cbd 100644 --- a/fs/open.c +++ b/fs/open.c @@ -30,6 +30,8 @@ #include #include #include +#include +#include #include "internal.h" @@ -1206,3 +1208,96 @@ int nonseekable_open(struct inode *inode, struct file *filp) } EXPORT_SYMBOL(nonseekable_open); + +/* limit the handle size to some value */ +#define MAX_HANDLE_SZ 4096 +long do_sys_name_to_handle(const char __user *name, + struct file_handle *fh) +{ + int retval; + int handle_size; + struct path path; + struct inode *inode; + void *handle = NULL; + struct super_block *sb; + struct uuid *this_fs_id; + + if (fh->handle_size > MAX_HANDLE_SZ) + return -EINVAL; + + retval = user_lpath(name, &path); + if (retval) + return retval; + + inode = path.dentry->d_inode; + /* + * name to handle conversion only done for regular files + * directories and symbolic links + */ + if (!S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode) && + !S_ISLNK(inode->i_mode)) { + retval = -EINVAL; + goto err_out; + } + if (fh->handle_size > 0) { + handle = kmalloc(fh->handle_size, GFP_KERNEL); + if (!handle) { + retval = -ENOMEM; + goto err_out; + } + + handle_size = fh->handle_size; + } else + handle_size = 0; + /* we ask for a non connected handle */ + retval = exportfs_encode_fh(path.dentry, (struct fid *)handle, + &handle_size, 0); + /* convert handle size to bytes */ + handle_size *= sizeof(u32); + fh->handle_type = retval; + if (handle_size <= fh->handle_size) { + if (copy_to_user(fh->f_handle, handle, + handle_size)) + retval = -EFAULT; + else + retval = 0; + } else + retval = -EOVERFLOW; + fh->handle_size = handle_size; + sb = path.mnt->mnt_sb; + if (!retval && sb->s_op->get_fsid) { + this_fs_id = sb->s_op->get_fsid(sb); + memcpy(fh->fsid.uuid, this_fs_id->uuid, sizeof(fh->fsid.uuid)); + } else + memset(fh->fsid.uuid, 0, sizeof(fh->fsid.uuid)); + kfree(handle); + +err_out: + path_put(&path); + return retval; +} + +SYSCALL_DEFINE2(name_to_handle, const char __user *, name, + struct file_handle __user *, handle) +{ + long ret; + struct file_handle f_handle; + if (copy_from_user(&f_handle, handle, sizeof(struct file_handle))) { + ret = -EFAULT; + goto err_out; + } + ret = do_sys_name_to_handle(name, &f_handle); + if (copy_to_user(&handle->handle_type, + &f_handle.handle_type, sizeof(f_handle.handle_type)) || + copy_to_user(&handle->handle_size, + &f_handle.handle_size, sizeof(f_handle.handle_size)) || + copy_to_user(handle->fsid.uuid, + f_handle.fsid.uuid, sizeof(f_handle.fsid.uuid))) { + + ret = -EFAULT; + } +err_out: + /* avoid REGPARM breakage on x86: */ + asmlinkage_protect(2, ret, name, handle); + return ret; +} diff --git a/include/linux/fs.h b/include/linux/fs.h index 39d57bc..157ed57 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -948,6 +948,20 @@ struct file { unsigned long f_mnt_write_state; #endif }; + +struct uuid { + char uuid[16]; +}; + +struct file_handle { + int handle_size; + int handle_type; + /* File system identifier */ + struct uuid fsid; + /* file identifier */ + void *f_handle; +}; + extern spinlock_t files_lock; #define file_list_lock() spin_lock(&files_lock); #define file_list_unlock() spin_unlock(&files_lock); @@ -1580,6 +1594,7 @@ struct super_operations { ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t); #endif int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t); + struct uuid *(*get_fsid)(struct super_block *); }; /* @@ -1918,6 +1933,8 @@ extern struct file * dentry_open(struct dentry *, struct vfsmount *, int, const struct cred *); extern int filp_close(struct file *, fl_owner_t id); extern char * getname(const char __user *); +extern long do_sys_name_to_handle(const char __user *name, + struct file_handle *fh); /* fs/ioctl.c */ @@ -2328,6 +2345,8 @@ extern struct super_block *get_super(struct block_device *); extern struct super_block *get_active_super(struct block_device *bdev); extern struct super_block *user_get_super(dev_t); extern void drop_super(struct super_block *sb); +extern struct super_block *fs_get_sb(struct uuid *fsid); + extern int dcache_dir_open(struct inode *, struct file *); extern int dcache_dir_close(struct inode *, struct file *); -- 1.7.0.4.360.g11766c