shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

clvmd: update add_reply_to_list

Browse Source 
Take mutex lock after the allocation just before
the structure is merged into reply list.
This commit is contained in:
Zdenek Kabelac 2014-03-20 14:29:42 +01:00
parent 2847994624
commit 37396e2fe5
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
daemons/clvmd/clvmd.c
View File

@ -1675,32 +1675,29 @@ static void add_reply_to_list(struct local_client *client, int status,
{
struct node_reply *reply;
pthread_mutex_lock(&client->bits.localsock.reply_mutex);
/* Add it to the list of replies */
if ((reply = dm_malloc(sizeof(*reply)))) {
reply->status = status;
clops->name_from_csid(csid, reply->node);
DEBUGLOG("Reply from node %s: %d bytes\n", reply->node, len);
if (len > 0) {
if (!(reply->replymsg = dm_malloc(len)))
reply->status = ENOMEM;
else {
memcpy(reply->replymsg, buf, len);
}
} else {
reply->replymsg = NULL;
}
/* Hook it onto the reply chain */
reply->next = client->bits.localsock.replies;
client->bits.localsock.replies = reply;
} else {
if (!(reply = dm_zalloc(sizeof(*reply)))) {
/* It's all gone horribly wrong... */
pthread_mutex_unlock(&client->bits.localsock.reply_mutex);
send_local_reply(client, ENOMEM, client->fd);
return;
}
reply->status = status;
clops->name_from_csid(csid, reply->node);
DEBUGLOG("Reply from node %s: %d bytes\n", reply->node, len);
if (len > 0) {
if (!(reply->replymsg = dm_malloc(len)))
reply->status = ENOMEM;
else
memcpy(reply->replymsg, buf, len);
} else
reply->replymsg = NULL;
pthread_mutex_lock(&client->bits.localsock.reply_mutex);
/* Hook it onto the reply chain */
reply->next = client->bits.localsock.replies;
client->bits.localsock.replies = reply;
DEBUGLOG("Got %d replies, expecting: %d\n",
client->bits.localsock.num_replies + 1,
client->bits.localsock.expected_replies);