summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Henriques <luis.henriques@canonical.com>2012-07-11 14:02:10 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 09:04:45 -0700
commitbb2b649805527af1d823f871e7e3a95c4e6a018e (patch)
treeb247be4fc93d60ee914b2f78a02e97956682dc7e
parent7ad71f960f0f6e06cbded278809674afc515036a (diff)
downloadlinux-3.10-bb2b649805527af1d823f871e7e3a95c4e6a018e.tar.gz
linux-3.10-bb2b649805527af1d823f871e7e3a95c4e6a018e.tar.bz2
linux-3.10-bb2b649805527af1d823f871e7e3a95c4e6a018e.zip
ocfs2: fix NULL pointer dereference in __ocfs2_change_file_space()
commit a4e08d001f2e50bb8b3c4eebadcf08e5535f02ee upstream. As ocfs2_fallocate() will invoke __ocfs2_change_file_space() with a NULL as the first parameter (file), it may trigger a NULL pointer dereferrence due to a missing check. Addresses http://bugs.launchpad.net/bugs/1006012 Signed-off-by: Luis Henriques <luis.henriques@canonical.com> Reported-by: Bret Towe <magnade@gmail.com> Tested-by: Bret Towe <magnade@gmail.com> Cc: Sunil Mushran <sunil.mushran@oracle.com> Acked-by: Joel Becker <jlbec@evilplan.org> Acked-by: Mark Fasheh <mfasheh@suse.com> 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@linuxfoundation.org>
-rw-r--r--fs/ocfs2/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 98513c8ed58..7602783d7f4 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -1950,7 +1950,7 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode,
if (ret < 0)
mlog_errno(ret);
- if (file->f_flags & O_SYNC)
+ if (file && (file->f_flags & O_SYNC))
handle->h_sync = 1;
ocfs2_commit_trans(osb, handle);