From patchwork Mon Jun 1 21:50:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Eric W. Biederman" X-Patchwork-Id: 27300 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n51LtDGs026970 for ; Mon, 1 Jun 2009 21:55:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756657AbZFAVwN (ORCPT ); Mon, 1 Jun 2009 17:52:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756692AbZFAVwJ (ORCPT ); Mon, 1 Jun 2009 17:52:09 -0400 Received: from out01.mta.xmission.com ([166.70.13.231]:43424 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754792AbZFAVvA (ORCPT ); Mon, 1 Jun 2009 17:51:00 -0400 Received: from in01.mta.xmission.com ([166.70.13.51]) by out01.mta.xmission.com with esmtp (Exim 4.62) (envelope-from ) id 1MBFPa-0007xf-Lr; Mon, 01 Jun 2009 15:51:18 -0600 Received: from [76.21.114.89] (helo=fess.ebiederm.org) by in01.mta.xmission.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1MBFPJ-0002C5-Ut; Mon, 01 Jun 2009 15:51:02 -0600 Received: from fess.ebiederm.org (localhost [127.0.0.1]) by fess.ebiederm.org (8.14.3/8.14.3/Debian-4) with ESMTP id n51Lox36017125; Mon, 1 Jun 2009 14:50:59 -0700 Received: (from eric@localhost) by fess.ebiederm.org (8.14.3/8.14.3/Submit) id n51LoxJA017124; Mon, 1 Jun 2009 14:50:59 -0700 From: "Eric W. Biederman" To: Al Viro Cc: , , , , Hugh Dickins , Tejun Heo , Alexey Dobriyan , Linus Torvalds , Alan Cox , Greg Kroah-Hartman , Nick Piggin , Andrew Morton , Christoph Hellwig , "Eric W. Biederman" , "Eric W. Biederman" Date: Mon, 1 Jun 2009 14:50:41 -0700 Message-Id: <1243893048-17031-16-git-send-email-ebiederm@xmission.com> X-Mailer: git-send-email 1.6.3.1.54.g99dd.dirty In-Reply-To: References: X-XM-SPF: eid=; ; ; mid=; ; ; hst=in01.mta.xmission.com; ; ; ip=76.21.114.89; ; ; frm=ebiederm@xmission.com; ; ; spf=neutral X-SA-Exim-Connect-IP: 76.21.114.89 X-SA-Exim-Rcpt-To: viro@ZenIV.linux.org.uk, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, hugh@veritas.com, tj@kernel.org, adobriyan@gmail.com, torvalds@linux-foundation.org, alan@lxorguk.ukuu.org.uk, gregkh@suse.de, npiggin@suse.de, akpm@linux-foundation.org, hch@infradead.org, ebiederm@maxwell.arastra.com, ebiederm@aristanetworks.com X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-DCC: XMission; sa03 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa03.xmission.com X-Spam-Level: X-Spam-Status: No, score=-2.5 required=8.0 tests=ALL_TRUSTED,BAYES_00, DCC_CHECK_NEGATIVE, T_TM2_M_HEADER_IN_MSG, T_TooManySym_01, T_TooManySym_02, UNTRUSTED_Relay, XMNoVowels, XM_SPF_Neutral autolearn=disabled version=3.2.5 X-Spam-Combo: ;Al Viro X-Spam-Relay-Country: X-Spam-Report: * -1.8 ALL_TRUSTED Passed through trusted hosts only via SMTP * 1.5 XMNoVowels Alpha-numberic number with no vowels * 0.0 T_TM2_M_HEADER_IN_MSG BODY: T_TM2_M_HEADER_IN_MSG * -2.6 BAYES_00 BODY: Bayesian spam probability is 0 to 1% * [score: 0.0000] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa03 1397; Body=1 Fuz1=1 Fuz2=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject * 0.0 XM_SPF_Neutral SPF-Neutral * 0.0 T_TooManySym_02 5+ unique symbols in subject * 0.4 UNTRUSTED_Relay Comes from a non-trusted relay Subject: [PATCH 16/23] vfs: Teach fstatfs, fstatfs64, ftruncate, fchdir, fchmod, fchown to use file_hotplug_lock X-SA-Exim-Version: 4.2.1 (built Thu, 25 Oct 2007 00:26:12 +0000) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Eric W. Biederman Signed-off-by: Eric W. Biederman --- fs/open.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/fs/open.c b/fs/open.c index 83d6369..354646b 100644 --- a/fs/open.c +++ b/fs/open.c @@ -167,9 +167,14 @@ SYSCALL_DEFINE2(fstatfs, unsigned int, fd, struct statfs __user *, buf) file = fget(fd); if (!file) goto out; + error = -EIO; + if (!file_hotplug_read_trylock(file)) + goto out_putf; error = vfs_statfs_native(file->f_path.dentry, &tmp); if (!error && copy_to_user(buf, &tmp, sizeof(tmp))) error = -EFAULT; + file_hotplug_read_unlock(file); +out_putf: fput(file); out: return error; @@ -188,9 +193,14 @@ SYSCALL_DEFINE3(fstatfs64, unsigned int, fd, size_t, sz, struct statfs64 __user file = fget(fd); if (!file) goto out; + error = -EIO; + if (!file_hotplug_read_trylock(file)) + goto out_putf; error = vfs_statfs64(file->f_path.dentry, &tmp); if (!error && copy_to_user(buf, &tmp, sizeof(tmp))) error = -EFAULT; + file_hotplug_read_unlock(file); +out_putf: fput(file); out: return error; @@ -309,6 +319,10 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small) if (!file) goto out; + error = -EIO; + if (!file_hotplug_read_trylock(file)) + goto out_putf; + /* explicitly opened as large or we are on 64-bit box */ if (file->f_flags & O_LARGEFILE) small = 0; @@ -317,16 +331,16 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small) inode = dentry->d_inode; error = -EINVAL; if (!S_ISREG(inode->i_mode) || !(file->f_mode & FMODE_WRITE)) - goto out_putf; + goto out_unlock; error = -EINVAL; /* Cannot ftruncate over 2^31 bytes without large file support */ if (small && length > MAX_NON_LFS) - goto out_putf; + goto out_unlock; error = -EPERM; if (IS_APPEND(inode)) - goto out_putf; + goto out_unlock; error = locks_verify_truncate(inode, file, length); if (!error) @@ -334,6 +348,9 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small) ATTR_MTIME|ATTR_CTIME); if (!error) error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, file); + +out_unlock: + file_hotplug_read_unlock(file); out_putf: fput(file); out: @@ -560,15 +577,21 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd) if (!file) goto out; + error = -EIO; + if (!file_hotplug_read_trylock(file)) + goto out_putf; + inode = file->f_path.dentry->d_inode; error = -ENOTDIR; if (!S_ISDIR(inode->i_mode)) - goto out_putf; + goto out_unlock; error = inode_permission(inode, MAY_EXEC | MAY_ACCESS); if (!error) set_fs_pwd(current->fs, &file->f_path); +out_unlock: + file_hotplug_read_unlock(file); out_putf: fput(file); out: @@ -612,6 +635,10 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd, mode_t, mode) if (!file) goto out; + err = -EIO; + if (!file_hotplug_read_trylock(file)) + goto out_putf; + dentry = file->f_path.dentry; inode = dentry->d_inode; @@ -619,7 +646,7 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd, mode_t, mode) err = mnt_want_write_file(file); if (err) - goto out_putf; + goto out_unlock; mutex_lock(&inode->i_mutex); if (mode == (mode_t) -1) mode = inode->i_mode; @@ -628,6 +655,8 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd, mode_t, mode) err = notify_change(dentry, &newattrs); mutex_unlock(&inode->i_mutex); mnt_drop_write(file->f_path.mnt); +out_unlock: + file_hotplug_read_unlock(file); out_putf: fput(file); out: @@ -766,13 +795,19 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd, uid_t, user, gid_t, group) if (!file) goto out; + error = -EIO; + if (!file_hotplug_read_trylock(file)) + goto out_fput; + error = mnt_want_write_file(file); if (error) - goto out_fput; + goto out_unlock; dentry = file->f_path.dentry; audit_inode(NULL, dentry); error = chown_common(dentry, user, group); mnt_drop_write(file->f_path.mnt); +out_unlock: + file_hotplug_read_unlock(file); out_fput: fput(file); out: