1 files changed, 20 insertions, 22 deletions

diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c
index 8206983f2ebf..636d8f613929 100644
--- a/fs/udf/ialloc.c
+++ b/fs/udf/ialloc.c
@@ -28,7 +28,7 @@
 #include "udf_i.h"
 #include "udf_sb.h"
 
-void udf_free_inode(struct inode * inode)
+void udf_free_inode(struct inode *inode)
 {
         struct super_block *sb = inode->i_sb;
         struct udf_sb_info *sbi = UDF_SB(sb);
@@ -50,7 +50,7 @@ void udf_free_inode(struct inode * inode)
                 else
                         UDF_SB_LVIDIU(sb)->numFiles =
                                 cpu_to_le32(le32_to_cpu(UDF_SB_LVIDIU(sb)->numFiles) - 1);
-                
+
                 mark_buffer_dirty(sbi->s_lvidbh);
         }
         mutex_unlock(&sbi->s_alloc_mutex);
@@ -58,18 +58,17 @@ void udf_free_inode(struct inode * inode)
         udf_free_blocks(sb, NULL, UDF_I_LOCATION(inode), 0, 1);
 }
 
-struct inode * udf_new_inode (struct inode *dir, int mode, int * err)
+struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
 {
         struct super_block *sb = dir->i_sb;
         struct udf_sb_info *sbi = UDF_SB(sb);
-        struct inode * inode;
+        struct inode *inode;
         int block;
         uint32_t start = UDF_I_LOCATION(dir).logicalBlockNum;
 
         inode = new_inode(sb);
 
-        if (!inode)
-        {
+        if (!inode) {
                 *err = -ENOMEM;
                 return NULL;
         }
@@ -82,16 +81,14 @@ struct inode * udf_new_inode (struct inode *dir, int mode, int * err)
         UDF_I_STRAT4096(inode) = 0;
 
         block = udf_new_block(dir->i_sb, NULL, UDF_I_LOCATION(dir).partitionReferenceNum,
-                start, err);
-        if (*err)
-        {
+                              start, err);
+        if (*err) {
                 iput(inode);
                 return NULL;
         }
 
         mutex_lock(&sbi->s_alloc_mutex);
-        if (UDF_SB_LVIDBH(sb))
-        {
+        if (UDF_SB_LVIDBH(sb)) {
                 struct logicalVolHeaderDesc *lvhd;
                 uint64_t uniqueID;
                 lvhd = (struct logicalVolHeaderDesc *)(UDF_SB_LVID(sb)->logicalVolContentsUse);
@@ -109,14 +106,13 @@ struct inode * udf_new_inode (struct inode *dir, int mode, int * err)
         }
         inode->i_mode = mode;
         inode->i_uid = current->fsuid;
-        if (dir->i_mode & S_ISGID)
-        {
+        if (dir->i_mode & S_ISGID) {
                 inode->i_gid = dir->i_gid;
                 if (S_ISDIR(mode))
                         mode |= S_ISGID;
-        }
-        else
+        } else {
                 inode->i_gid = current->fsgid;
+        }
 
         UDF_I_LOCATION(inode).logicalBlockNum = block;
         UDF_I_LOCATION(inode).partitionReferenceNum = UDF_I_LOCATION(dir).partitionReferenceNum;
@@ -125,17 +121,20 @@ struct inode * udf_new_inode (struct inode *dir, int mode, int * err)
         UDF_I_LENEATTR(inode) = 0;
         UDF_I_LENALLOC(inode) = 0;
         UDF_I_USE(inode) = 0;
-        if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_EXTENDED_FE))
-        {
+        if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_EXTENDED_FE)) {
                 UDF_I_EFE(inode) = 1;
                 UDF_UPDATE_UDFREV(inode->i_sb, UDF_VERS_USE_EXTENDED_FE);
                 UDF_I_DATA(inode) = kzalloc(inode->i_sb->s_blocksize - sizeof(struct extendedFileEntry), GFP_KERNEL);
-        }
-        else
-        {
+        } else {
                 UDF_I_EFE(inode) = 0;
                 UDF_I_DATA(inode) = kzalloc(inode->i_sb->s_blocksize - sizeof(struct fileEntry), GFP_KERNEL);
         }
+        if (!UDF_I_DATA(inode)) {
+                iput(inode);
+                *err = -ENOMEM;
+                mutex_unlock(&sbi->s_alloc_mutex);
+                return NULL;
+        }
         if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_AD_IN_ICB))
                 UDF_I_ALLOCTYPE(inode) = ICBTAG_FLAG_AD_IN_ICB;
         else if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_SHORT_AD))
@@ -148,8 +147,7 @@ struct inode * udf_new_inode (struct inode *dir, int mode, int * err)
         mark_inode_dirty(inode);
         mutex_unlock(&sbi->s_alloc_mutex);
 
-        if (DQUOT_ALLOC_INODE(inode))
-        {
+        if (DQUOT_ALLOC_INODE(inode)) {
                 DQUOT_DROP(inode);
                 inode->i_flags |= S_NOQUOTA;
                 inode->i_nlink = 0;