diff --git a/fs/hmdfs/comm/device_node.c b/fs/hmdfs/comm/device_node.c
index 7c2bac914bb46b37a14b4623d6dcd38ac0d34873..0f2585de61fe6ab0f95b70ebbaef0dddbd0f0635 100644
--- a/fs/hmdfs/comm/device_node.c
+++ b/fs/hmdfs/comm/device_node.c
@@ -232,9 +232,11 @@ static ssize_t sbi_cmd_store(struct kobject *kobj, struct sbi_attribute *attr,
 		hmdfs_err("Illegal cmd : cmd = %d", cmd);
 		return len;
 	}
+	mutex_lock(&sbi->cmd_handler_mutex);
 	hmdfs_info("Recved cmd: %s", cmd2str(cmd));
 	if (cmd_handler[cmd])
 		cmd_handler[cmd](buf, len, sbi);
+	mutex_unlock(&sbi->cmd_handler_mutex);
 	return len;
 }
 
diff --git a/fs/hmdfs/comm/socket_adapter.c b/fs/hmdfs/comm/socket_adapter.c
index 7005303e3735b455e348cdc08e481b39a7bb0a24..0404c2a79d3abb10b8130fbceb92fe3a5d2982b6 100644
--- a/fs/hmdfs/comm/socket_adapter.c
+++ b/fs/hmdfs/comm/socket_adapter.c
@@ -439,13 +439,13 @@ int hmdfs_sendmessage_request(struct hmdfs_peer *con,
 		msg_wq = kzalloc(sizeof(*msg_wq), GFP_KERNEL);
 		if (!msg_wq) {
 			ret = -ENOMEM;
-			goto free;
+			goto free_filp;
 		}
 		ret = msg_init(con, msg_wq);
 		if (ret) {
 			kfree(msg_wq);
 			msg_wq = NULL;
-			goto free;
+			goto free_filp;
 		}
 		dec = true;
 		head->msg_id = cpu_to_le32(msg_wq->head.msg_id);
@@ -513,6 +513,7 @@ int hmdfs_sendmessage_request(struct hmdfs_peer *con,
 free_filp:
 	if (sm->local_filp)
 		fput(sm->local_filp);
+	kfree(head);
 	return ret;
 }
 
diff --git a/fs/hmdfs/hmdfs.h b/fs/hmdfs/hmdfs.h
index 9157c55ba3927da555d2ddfa2d12f24de8f2ea40..45fcf9f9b3f3b12c360e223ca0667c6f50cc25f4 100644
--- a/fs/hmdfs/hmdfs.h
+++ b/fs/hmdfs/hmdfs.h
@@ -169,6 +169,7 @@ struct hmdfs_sb_info {
 	/* To bridge the userspace utils */
 	struct kfifo notify_fifo;
 	spinlock_t notify_fifo_lock;
+	struct mutex cmd_handler_mutex;
 
 	/* For reboot detect */
 	uint64_t boot_cookie;
diff --git a/fs/hmdfs/inode_merge.c b/fs/hmdfs/inode_merge.c
index c020c8c201fabc9fedd003a6932d3be1a8c0f31b..c5cd7bdc4905a50770c03452fa2f60df7c067442 100644
--- a/fs/hmdfs/inode_merge.c
+++ b/fs/hmdfs/inode_merge.c
@@ -408,6 +408,7 @@ static void merge_lookup_work_func(struct work_struct *work)
 	comrade = merge_lookup_comrade(ml_work->sbi, ml_work->name,
 		ml_work->devid, ml_work->flags);
 	if (IS_ERR(comrade)) {
+		mutex_lock(&mdi->work_lock);
 		goto out;
 	}
 
@@ -504,6 +505,7 @@ static int lookup_merge_normal(struct dentry *dentry, unsigned int flags)
 		goto out_ppath;
 	}
 
+	mutex_lock(&mdi->work_lock);
 	mutex_lock(&sbi->connections.node_lock);
 	if (mdi->type != DT_REG || devid == 0) {
 		snprintf(cpath, PATH_MAX, "device_view/local%s/%s", ppath,
@@ -524,6 +526,7 @@ static int lookup_merge_normal(struct dentry *dentry, unsigned int flags)
 			hmdfs_err("failed to create remote lookup work");
 	}
 	mutex_unlock(&sbi->connections.node_lock);
+	mutex_unlock(&mdi->work_lock);
 
 	wait_event(mdi->wait_queue, is_merge_lookup_end(mdi));
 	
diff --git a/fs/hmdfs/main.c b/fs/hmdfs/main.c
index 53d6989179695fb1f27746d30b03d97d86190561..8075fe4bc5c9c8854c87d9cde58bbebc18780c4e 100644
--- a/fs/hmdfs/main.c
+++ b/fs/hmdfs/main.c
@@ -692,6 +692,7 @@ static int hmdfs_init_sbi(struct hmdfs_sb_info *sbi)
 	ret = 0;
 
 	spin_lock_init(&sbi->notify_fifo_lock);
+	mutex_init(&sbi->cmd_handler_mutex);
 	sbi->s_case_sensitive = false;
 	sbi->s_features = HMDFS_FEATURE_READPAGES |
 			  HMDFS_FEATURE_READPAGES_OPEN |