From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + r-o-bind-mounts-elevate-write-count-for-ncp_ioctl.patch added to -mm tree Date: Fri, 15 Feb 2008 14:48:59 -0800 Message-ID: <200802152248.m1FMmxRG028156@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp2.linux-foundation.org ([207.189.120.14]:44028 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934142AbYBOWtT (ORCPT ); Fri, 15 Feb 2008 17:49:19 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: haveblue@us.ibm.com, akpm@linux-foundation.org, hch@lst.de, viro@ZenIV.linux.org.uk The patch titled r/o bind mounts: elevate write count for ncp_ioctl() has been added to the -mm tree. Its filename is r-o-bind-mounts-elevate-write-count-for-ncp_ioctl.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: r/o bind mounts: elevate write count for ncp_ioctl() From: Dave Hansen Acked-by: Al Viro Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Dave Hansen Signed-off-by: Andrew Morton --- fs/ncpfs/ioctl.c | 54 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff -puN fs/ncpfs/ioctl.c~r-o-bind-mounts-elevate-write-count-for-ncp_ioctl fs/ncpfs/ioctl.c --- a/fs/ncpfs/ioctl.c~r-o-bind-mounts-elevate-write-count-for-ncp_ioctl +++ a/fs/ncpfs/ioctl.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -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,57 @@ 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 */ + 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) { _ Patches currently in -mm which might be from haveblue@us.ibm.com are enable-hotplug-memory-remove-for-ppc64.patch reiserfs-eliminate-private-use-of-struct-file-in-xattr.patch hppfs-pass-vfsmount-to-dentry_open.patch check-for-null-vfsmount-in-dentry_open.patch fix-up-new-filp-allocators.patch do-namei_flags-calculation-inside-open_namei.patch merge-open_namei-and-do_filp_open.patch r-o-bind-mounts-stub-functions.patch r-o-bind-mounts-create-helper-to-drop-file-write-access.patch r-o-bind-mounts-drop-write-during-emergency-remount.patch r-o-bind-mounts-elevate-write-count-for-vfs_rmdir.patch r-o-bind-mounts-elevate-write-count-for-callers-of-vfs_mkdir.patch r-o-bind-mounts-elevate-mnt_writers-for-unlink-callers.patch r-o-bind-mounts-elevate-write-count-for-xattr_permission-callers.patch r-o-bind-mounts-elevate-write-count-for-ncp_ioctl.patch r-o-bind-mounts-write-counts-for-time-functions.patch r-o-bind-mounts-elevate-write-count-for-do_utimes.patch r-o-bind-mounts-write-count-for-file_update_time.patch r-o-bind-mounts-write-counts-for-link-symlink.patch r-o-bind-mounts-elevate-write-count-for-ioctls.patch r-o-bind-mounts-elevate-write-count-for-opens.patch r-o-bind-mounts-get-write-access-for-vfs_rename-callers.patch r-o-bind-mounts-elevate-write-count-for-chmod-chown-callers.patch r-o-bind-mounts-write-counts-for-truncate.patch r-o-bind-mounts-elevate-count-for-xfs-timestamp-updates.patch r-o-bind-mounts-make-access-use-new-r-o-helper.patch r-o-bind-mounts-check-mnt-instead-of-superblock-directly.patch r-o-bind-mounts-get-callers-of-vfs_mknod-create.patch r-o-bind-mounts-track-numbers-of-writers-to-mounts.patch r-o-bind-mounts-honor-mount-writer-counts-at-remount.patch r-o-bind-mounts-debugging-for-missed-calls.patch reiser4.patch page-owner-tracking-leak-detector.patch