Home » Mailing list archives » linux-kernel » 2007 » November » 1

[PATCH 11/27] r-o-bind-mounts-elevate-write-count-during-entire-ncp_ioctl

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Dave Hansen <haveblue@...>
To: <akpm@...>
Cc: <linux-kernel@...>, <miklos@...>, <hch@...>, Dave Hansen <haveblue@...>
Subject: [PATCH 11/27] r-o-bind-mounts-elevate-write-count-during-entire-ncp_ioctl
Date: Thursday, November 1, 2007 - 7:08 pm

fs/ncpfs/ioctl.c: In function 'ncp_ioctl_need_write':
fs/ncpfs/ioctl.c:852: error: label at end of compound statement

Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 linux-2.6.git-dave/fs/ncpfs/ioctl.c |   57 ++++++++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 2 deletions(-)

diff -puN fs/ncpfs/ioctl.c~r-o-bind-mounts-elevate-write-count-during-entire-ncp_ioctl fs/ncpfs/ioctl.c
--- linux-2.6.git/fs/ncpfs/ioctl.c~r-o-bind-mounts-elevate-write-count-during-entire-ncp_ioctl	2007-11-01 14:46:11.000000000 -0700
+++ linux-2.6.git-dave/fs/ncpfs/ioctl.c	2007-11-01 14:46:11.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);
@@ -817,11 +818,63 @@ outrel:			
 				return -EFAULT;
 			return 0;
 		}
-
+	default: /* unkown IOCTL command, assume write */
+		;
 	}
 	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 */
+	}
+	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)
 {
_
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/27] Read-only bind mounts (-mm resend), Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 27/27] keep track of mnt_writer state of struct file, Dave Hansen, (Thu Nov 1, 7:09 pm)
[PATCH 25/27] r-o-bind-mounts-track-number-of-mount-writers-..., Dave Hansen, (Thu Nov 1, 7:09 pm)
Re: [PATCH 25/27] r-o-bind-mounts-track-number-of-mount-writ..., Andrew Morton, (Mon Nov 5, 7:35 pm)
[PATCH 22/27] r-o-bind-mounts-nfs-check-mnt-instead-of-super..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 24/27] r-o-bind-mounts-track-number-of-mount-writers, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 26/27] r-o-bind-mounts-honor-r-w-changes-at-do_remoun..., Dave Hansen, (Thu Nov 1, 7:09 pm)
[PATCH 19/27] r-o-bind-mounts-elevate-writer-count-for-chown..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 23/27] r-o-bind-mounts-sys_mknodat-elevate-write-coun..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 18/27] r-o-bind-mounts-elevate-write-count-over-calls..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 21/27] r-o-bind-mounts-make-access-use-mnt-check, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 20/27] r-o-bind-mounts-elevate-writer-count-for-do_sy..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 17/27] r-o-bind-mounts-elevate-write-count-opend-files, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 16/27] r-o-bind-mounts-elevate-write-count-for-some-i..., Dave Hansen, (Thu Nov 1, 7:08 pm)
Re: [PATCH 16/27] r-o-bind-mounts-elevate-write-count-for-so..., Andrew Morton, (Mon Nov 5, 7:23 pm)
Re: [PATCH 16/27] r-o-bind-mounts-elevate-write-count-for-so..., Jan Kara, (Tue Nov 6, 5:01 am)
Re: [PATCH 16/27] r-o-bind-mounts-elevate-write-count-for-so..., Andrew Morton, (Tue Nov 6, 5:12 am)
[PATCH 13/27] r-o-bind-mounts-elevate-write-count-for-do_uti..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 15/27] r-o-bind-mounts-elevate-write-count-for-link-a..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 12/27] r-o-bind-mounts-elevate-write-count-for-do_sys..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 11/27] r-o-bind-mounts-elevate-write-count-during-ent..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 14/27] r-o-bind-mounts-elevate-write-count-for-file_u..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 07/27] r-o-bind-mounts-do_rmdir-elevate-write-count, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 10/27] r-o-bind-mounts-elevate-mount-count-for-extend..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 01/27] do namei_flags calculation inside open_namei(), Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 09/27] r-o-bind-mounts-elevate-mnt-writers-for-vfs_un..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 06/27] r-o-bind-mounts-stub-functions, Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 08/27] r-o-bind-mounts-elevate-mnt-writers-for-caller..., Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 05/27] rename open_namei() to open_pathname(), Dave Hansen, (Thu Nov 1, 7:08 pm)
Re: [PATCH 05/27] rename open_namei() to open_pathname(), Christoph Hellwig, (Mon Nov 26, 10:33 am)
[PATCH 04/27] kill filp_open(), Dave Hansen, (Thu Nov 1, 7:08 pm)
Re: [PATCH 04/27] kill filp_open(), Andrew Morton, (Wed Jan 16, 4:52 am)
Re: [PATCH 04/27] kill filp_open(), Dave Hansen, (Wed Jan 16, 1:04 pm)
Re: [PATCH 04/27] kill filp_open(), Bryn M. Reeves, (Wed Jan 16, 1:12 pm)
Re: [PATCH 04/27] kill filp_open(), Christoph Hellwig, (Wed Jan 16, 1:10 pm)
Re: [PATCH 04/27] kill filp_open(), Dave Hansen, (Wed Jan 16, 1:41 pm)
Re: [PATCH 04/27] kill filp_open(), Christoph Hellwig, (Wed Jan 16, 1:47 pm)
[PATCH 03/27] kill do_filp_open(), Dave Hansen, (Thu Nov 1, 7:08 pm)
[PATCH 02/27] make open_namei() return a filp, Dave Hansen, (Thu Nov 1, 7:08 pm)