lkml.org 
[lkml]   [2010]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[092/205] sysvfs: fix NULL deref. when allocating new inode
2.6.34-stable review patch.  If anyone has any objections, please let us know.

------------------
From: Lubomir Rintel <lkundrak@v3.sk>

commit 46c23d7f520e315dde86881b38ba92ebdf34ced5 upstream.

A call to sysv_write_inode() in sysv_new_inode() to its new interface that
replaced wait flag with writeback structure. This was broken by
a9185b41a4f84971b930c519f0c63bd450c4810d ("pass writeback_control to
->write_inode").

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
fs/sysv/ialloc.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/fs/sysv/ialloc.c
+++ b/fs/sysv/ialloc.c
@@ -25,6 +25,7 @@
#include <linux/stat.h>
#include <linux/string.h>
#include <linux/buffer_head.h>
+#include <linux/writeback.h>
#include "sysv.h"

/* We don't trust the value of
@@ -139,6 +140,9 @@ struct inode * sysv_new_inode(const stru
struct inode *inode;
sysv_ino_t ino;
unsigned count;
+ struct writeback_control wbc = {
+ .sync_mode = WB_SYNC_NONE
+ };

inode = new_inode(sb);
if (!inode)
@@ -177,7 +181,7 @@ struct inode * sysv_new_inode(const stru
mark_inode_dirty(inode);

inode->i_mode = mode; /* for sysv_write_inode() */
- sysv_write_inode(inode, 0); /* ensure inode not allocated again */
+ sysv_write_inode(inode, &wbc); /* ensure inode not allocated again */
mark_inode_dirty(inode); /* cleared by sysv_write_inode() */
/* That's it. */
unlock_super(sb);



\
 
 \ /
  Last update: 2010-07-30 20:27    [from the cache]
©2003-2011 Jasper Spaans