lkml.org 
[lkml]   [2007]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 10/24] elevate write count during entire ncp_ioctl()
    From
    Date

    Some ioctls need write access, but others don't. Make a helper
    function to decide when write access is needed, and take it.

    Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
    ---
    lxc-dave/fs/ncpfs/ioctl.c | 55 +++++++++++++++++++++++++++++++++++++++++++++-
    1 file changed, 54 insertions(+), 1 deletion(-)
    diff -puN fs/ncpfs/ioctl.c~elevate-write-count-during-entire-ncp-ioctl fs/ncpfs/ioctl.c
    --- lxc/fs/ncpfs/ioctl.c~elevate-write-count-during-entire-ncp-ioctl 2007-09-17 09:44:01.000000000 -0700
    +++ lxc-dave/fs/ncpfs/ioctl.c 2007-09-17 09:44:01.000000000 -0700
    @@ -14,6 +14,7 @@
    #include <linux/ioctl.h>
    #include <linux/time.h>
    #include <linux/mm.h>
    +#include <linux/mount.h>
    #include <linux/highuid.h>
    #include <linux/smp_lock.h>
    #include <linux/vmalloc.h>
    @@ -261,7 +262,7 @@ ncp_get_charsets(struct ncp_server* serv
    }
    #endif /* CONFIG_NCPFS_NLS */

    -int ncp_ioctl(struct inode *inode, struct file *filp,
    +static int __ncp_ioctl(struct inode *inode, struct file *filp,
    unsigned int cmd, unsigned long arg)
    {
    struct ncp_server *server = NCP_SERVER(inode);
    @@ -822,6 +823,58 @@ outrel:
    return -EINVAL;
    }

    +static int ncp_ioctl_need_write(unsigned int cmd)
    +{
    + switch (cmd) {
    + case NCP_IOC_GET_FS_INFO:
    + case NCP_IOC_GET_FS_INFO_V2:
    + case NCP_IOC_NCPREQUEST:
    + case NCP_IOC_SETDENTRYTTL:
    + case NCP_IOC_SIGN_INIT:
    + case NCP_IOC_LOCKUNLOCK:
    + case NCP_IOC_SET_SIGN_WANTED:
    + return 1;
    + case NCP_IOC_GETOBJECTNAME:
    + case NCP_IOC_SETOBJECTNAME:
    + case NCP_IOC_GETPRIVATEDATA:
    + case NCP_IOC_SETPRIVATEDATA:
    + case NCP_IOC_SETCHARSETS:
    + case NCP_IOC_GETCHARSETS:
    + case NCP_IOC_CONN_LOGGED_IN:
    + case NCP_IOC_GETDENTRYTTL:
    + case NCP_IOC_GETMOUNTUID2:
    + case NCP_IOC_SIGN_WANTED:
    + case NCP_IOC_GETROOT:
    + case NCP_IOC_SETROOT:
    + return 0;
    + default:
    + /* unkown IOCTL command, assume write */
    + WARN_ON(1);
    + }
    + return 1;
    +}
    +
    +int ncp_ioctl(struct inode *inode, struct file *filp,
    + unsigned int cmd, unsigned long arg)
    +{
    + int ret;
    +
    + if (ncp_ioctl_need_write(cmd)) {
    + /*
    + * inside the ioctl(), any failures which
    + * are because of file_permission() are
    + * -EACCESS, so it seems consistent to keep
    + * that here.
    + */
    + if (mnt_want_write(filp->f_vfsmnt))
    + return -EACCES;
    + }
    + ret = __ncp_ioctl(inode, filp, cmd, arg);
    + if (ncp_ioctl_need_write(cmd))
    + mnt_drop_write(filp->f_vfsmnt);
    + return ret;
    +}
    +
    #ifdef CONFIG_COMPAT
    long ncp_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
    {
    _
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-09-17 20:35    [from the cache]
    ©2003-2011 Jasper Spaans