1 files changed, 4 insertions, 2 deletions

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 0c31035bbfee..b7cc615d42ef 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -3203,8 +3203,10 @@ static struct ceph_msg_data *ceph_msg_data_create(enum ceph_msg_data_type type)
                 return NULL;
 
         data = kmem_cache_zalloc(ceph_msg_data_cache, GFP_NOFS);
-        if (data)
-                data->type = type;
+        if (!data)
+                return NULL;
+
+        data->type = type;
         INIT_LIST_HEAD(&data->links);
 
         return data;