[PATCH 10/24] elevate write count during entire ncp_ioctl()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

To: <akpm@...>

Cc: <linux-kernel@...>, <hch@...>, Dave Hansen <haveblue@...>

Subject: [PATCH 10/24] elevate write count during entire ncp_ioctl()

Date: Monday, September 17, 2007 - 2:27 pm

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)
 {
_
-
unsubscribe noticeTo 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/

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

[PATCH 00/24] Read-only bind mounts, Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 00/24] Read-only bind mounts, Christoph Hellwig, (Wed Sep 19, 1:44 pm)

Re: [PATCH 00/24] Read-only bind mounts, Andrew Morton, (Wed Sep 19, 5:24 pm)

Re: [PATCH 00/24] Read-only bind mounts, Dave Hansen, (Wed Sep 19, 5:56 pm)

Re: [PATCH 00/24] Read-only bind mounts, Andrew Morton, (Wed Sep 19, 6:06 pm)

Re: [PATCH 00/24] Read-only bind mounts, Miklos Szeredi, (Thu Sep 20, 5:58 am)

Re: [PATCH 00/24] Read-only bind mounts, Serge E. Hallyn, (Wed Sep 19, 10:21 am)

[PATCH 14/24] unix_find_other() elevate write count for touc..., Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 14/24] unix_find_other() elevate write count for ..., Christoph Hellwig, (Wed Sep 19, 1:35 pm)

[PATCH 22/24] do_rmdir(): elevate write count, Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 22/24] do_rmdir(): elevate write count, Christoph Hellwig, (Wed Sep 19, 1:39 pm)

[PATCH 21/24] elevate mnt writers for vfs_unlink() callers, Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 21/24] elevate mnt writers for vfs_unlink() callers, Christoph Hellwig, (Wed Sep 19, 1:38 pm)

[PATCH 19/24] elevate write count for do_sys_utime() and tou..., Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 19/24] elevate write count for do_sys_utime() and..., Christoph Hellwig, (Wed Sep 19, 1:36 pm)

[PATCH 20/24] sys_mknodat(): elevate write count for vfs_mkn..., Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 20/24] sys_mknodat(): elevate write count for vfs..., Christoph Hellwig, (Wed Sep 19, 1:38 pm)

[PATCH 09/24] elevate mnt writers for callers of vfs_mkdir(), Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 09/24] elevate mnt writers for callers of vfs_mkd..., Christoph Hellwig, (Wed Sep 19, 1:32 pm)

[PATCH 04/24] r/o bind mounts: stub functions, Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 04/24] r/o bind mounts: stub functions, Christoph Hellwig, (Wed Sep 19, 1:28 pm)

[PATCH 11/24] elevate write count for link and symlink calls, Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 11/24] elevate write count for link and symlink c..., Christoph Hellwig, (Wed Sep 19, 1:33 pm)

[PATCH 06/24] r/o bind mounts: elevate write count for some ..., Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 06/24] r/o bind mounts: elevate write count for s..., Christoph Hellwig, (Wed Sep 19, 1:31 pm)

[PATCH 18/24] elevate write count for do_utimes(), Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 18/24] elevate write count for do_utimes(), Christoph Hellwig, (Wed Sep 19, 1:36 pm)

[PATCH 16/24] nfs: check mnt instead of superblock directly, Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 16/24] nfs: check mnt instead of superblock direc..., Christoph Hellwig, (Wed Sep 19, 1:36 pm)

[PATCH 17/24] elevate writer count for do_sys_truncate(), Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 17/24] elevate writer count for do_sys_truncate(), Christoph Hellwig, (Wed Sep 19, 1:36 pm)

[PATCH 15/24] elevate write count over calls to vfs_rename(), Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 15/24] elevate write count over calls to vfs_rena..., Christoph Hellwig, (Wed Sep 19, 1:35 pm)

[PATCH 12/24] elevate mount count for extended attributes, Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 12/24] elevate mount count for extended attributes, Christoph Hellwig, (Wed Sep 19, 1:34 pm)

[PATCH 10/24] elevate write count during entire ncp_ioctl(), Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 10/24] elevate write count during entire ncp_ioct..., Christoph Hellwig, (Wed Sep 19, 1:33 pm)

[PATCH 01/24] filesystem helpers for custom 'struct file's, Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 01/24] filesystem helpers for custom 'struct file's, Christoph Hellwig, (Wed Sep 19, 1:26 pm)

[PATCH] docuement filesystem helpers for custom 'struct file's, Dave Hansen, (Wed Sep 19, 1:47 pm)

Re: [PATCH] docuement filesystem helpers for custom 'struct ..., Randy Dunlap, (Wed Sep 19, 6:07 pm)

Re: [PATCH] docuement filesystem helpers for custom 'struct ..., Dave Hansen, (Thu Sep 20, 1:25 pm)

Re: [PATCH] docuement filesystem helpers for custom 'struct ..., Christoph Hellwig, (Thu Sep 20, 1:30 pm)

[PATCH 05/24] elevate write count open()'d files, Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 05/24] elevate write count open()'d files, Christoph Hellwig, (Wed Sep 19, 1:30 pm)

[PATCH 07/24] elevate writer count for chown and friends, Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 07/24] elevate writer count for chown and friends, Christoph Hellwig, (Wed Sep 19, 1:31 pm)

[PATCH 13/24] elevate write count for file_update_time(), Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 13/24] elevate write count for file_update_time(), Christoph Hellwig, (Wed Sep 19, 1:35 pm)

[PATCH 08/24] make access() use mnt check, Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 08/24] make access() use mnt check, Christoph Hellwig, (Wed Sep 19, 1:32 pm)

[PATCH 03/24] create cleanup helper svc_msnfs(), Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Jan Engelhardt, (Wed Sep 19, 1:39 pm)

Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Dave Hansen, (Wed Sep 19, 1:45 pm)

Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Trond Myklebust, (Wed Sep 19, 1:54 pm)

Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Christoph Hellwig, (Wed Sep 19, 1:59 pm)

Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Trond Myklebust, (Wed Sep 19, 2:10 pm)

Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Christoph Hellwig, (Wed Sep 19, 1:28 pm)

[PATCH 02/24] rearrange may_open() to be r/o friendly, Dave Hansen, (Mon Sep 17, 2:27 pm)

Re: [PATCH 02/24] rearrange may_open() to be r/o friendly, Christoph Hellwig, (Wed Sep 19, 1:27 pm)

Re: [PATCH 02/24] rearrange may_open() to be r/o friendly, Dave Hansen, (Thu Sep 20, 2:47 pm)


linux-kernel:
Scott Preece	Re: Linux Foundation Technical Advisory Board Elections
Luis R. Rodriguez	Re: [Announce] Linux-tiny project revival
Andrew Morton	2.6.23-rc1-mm2
Dave Hansen	[PATCH 02/24] rearrange may_open() to be r/o friendly
git:

linux-netdev:
David Miller	[GIT]: Networking
David Miller	Re: [BUG] New Kernel Bugs
David Miller	Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock().
Gerrit Renker	[PATCH 27/37] dccp: Integration of dynamic feature activation - part 2 (server side)
openbsd-misc:

[PATCH 10/24] elevate write count during entire ncp_ioctl()

Online users