commit 60236436491ce79327f9faf656a4392b1d92f4df
author Linux Build Service Account <lnxbuild@localhost> Mon Aug 06 07:04:50 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Mon Aug 06 07:04:50 2012 -0700
tree 1f72c8aada286427272bdef4ffa759f08ecbc601
parent 732f00aa455d86a6953ba401a6068af81d304a52
parent fb92e57e92999dcd0f4620c1f02f07c2f9c8438f

Merge "fs: yaffs2: Add null pointer check before dereferencing inode" into msm-3.4

fs/yaffs2/yaffs_vfs.c

diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c
index 8e8c55b..4dd618f 100644
--- a/fs/yaffs2/yaffs_vfs.c
+++ b/fs/yaffs2/yaffs_vfs.c
@@ -497,8 +497,16 @@
 
 	if (ret_val == YAFFS_OK) {
 		if (target) {
-			drop_nlink(new_dentry->d_inode);
-			mark_inode_dirty(new_dentry->d_inode);
+			/*
+			 * We have identified target to be a
+			 * valid directory earlier. If it is
+			 * not the case throw a warning.
+			 */
+			WARN_ON(!new_dentry->d_inode);
+			if (new_dentry->d_inode) {
+				drop_nlink(new_dentry->d_inode);
+				mark_inode_dirty(new_dentry->d_inode);
+			}
 		}
 
 		update_dir_time(old_dir);