[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090706053128.6318.16410.sendpatchset@localhost.localdomain>
Date: Mon, 6 Jul 2009 01:29:14 -0400
From: Amerigo Wang <amwang@...hat.com>
To: linux-kernel@...r.kernel.org
Cc: Jeff Mahoney <jeffm@...e.com>, Yan Zheng <zheng.yan@...cle.com>,
Josef Bacik <jbacik@...hat.com>,
Chris Mason <chris.mason@...cle.com>,
Amerigo Wang <amwang@...hat.com>, akpm@...ux-foundation.org,
linux-btrfs@...r.kernel.org,
Sven Wegener <sven.wegener@...aler.net>
Subject: [Patch] btrfs: use file_remove_suid() after i_mutex is held
file_remove_suid() should be called with i_mutex held,
file_update_time() too. So move them after mutex_lock().
Plus, check the return value of kmalloc().
Signed-off-by: WANG Cong <amwang@...hat.com>
---
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 7c3cd24..cd36301 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -944,14 +944,17 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
if (count == 0)
goto out_nolock;
+ mutex_lock(&inode->i_mutex);
+
err = file_remove_suid(file);
if (err)
- goto out_nolock;
+ goto out;
file_update_time(file);
pages = kmalloc(nrptrs * sizeof(struct page *), GFP_KERNEL);
+ if (!pages)
+ goto out;
- mutex_lock(&inode->i_mutex);
BTRFS_I(inode)->sequence++;
first_index = pos >> PAGE_CACHE_SHIFT;
last_index = (pos + count) >> PAGE_CACHE_SHIFT;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists