From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 26/34] union-mount: Temporarily disable some syscalls Date: Thu, 16 Sep 2010 15:12:17 -0700 Message-ID: <1284675145-4391-27-git-send-email-vaurora@redhat.com> References: <1284675145-4391-1-git-send-email-vaurora@redhat.com> Cc: Miklos Szeredi , Christoph Hellwig , Andreas Gruenbacher , Nick Piggin , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Valerie Aurora To: Alexander Viro Return-path: In-Reply-To: <1284675145-4391-1-git-send-email-vaurora@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org After some of the following patches in this series, a few system calls will crash the kernel if called on union-mounted file systems. Temporarily disable rename(), unlink(), and rmdir() on unioned file systems until they are correctly implemented by later patches. Signed-off-by: Valerie Aurora --- fs/namei.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 0b6378e..2de4378 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -35,6 +35,7 @@ #include #include "internal.h" +#include "union.h" /* [Feb-1997 T. Schoebel-Theuer] * Fundamental changes in the pathname lookup mechanisms (namei) @@ -2404,6 +2405,11 @@ static long do_rmdir(int dfd, const char __user *pathname) if (error) return error; + /* rmdir() on union mounts not implemented yet */ + error = -EINVAL; + if (IS_DIR_UNIONED(nd.path.dentry)) + goto exit1; + switch(nd.last_type) { case LAST_DOTDOT: error = -ENOTEMPTY; @@ -2500,6 +2506,11 @@ static long do_unlinkat(int dfd, const char __user *pathname) if (nd.last_type != LAST_NORM) goto exit1; + /* unlink() on union mounts not implemented yet */ + error = -EINVAL; + if (IS_DIR_UNIONED(nd.path.dentry)) + goto exit1; + nd.flags &= ~LOOKUP_PARENT; mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex, I_MUTEX_PARENT); @@ -2890,6 +2901,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname, if (oldnd.path.mnt != newnd.path.mnt) goto exit2; + /* rename() on union mounts not implemented yet */ + error = -EXDEV; + if (IS_DIR_UNIONED(oldnd.path.dentry) || + IS_DIR_UNIONED(newnd.path.dentry)) + goto exit2; + old_dir = oldnd.path.dentry; error = -EBUSY; if (oldnd.last_type != LAST_NORM) -- 1.6.3.3