From c9ab8ce0a30020968646dbc45ba3767ff41bbcec Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 1 Mar 2012 09:54:23 +0000 Subject: [PATCH] Check for allocation error return ENOMEM when malloc fails. --- WHATS_NEW | 1 + daemons/clvmd/lvm-functions.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 82f964fc2..24f809682 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.94 - ==================================== + Check for allocation failure in hold_lock() in clvmd. Use set_lv() (wipe initial 4KiB) for non zeroed thin volume. Allow cluster mirrors to handle the absence of the checkpoint lib (libSaCkpt). Revert free of allocated segtype in init segment error path (2.02.89). diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c index eeb08b03e..e02e77316 100644 --- a/daemons/clvmd/lvm-functions.c +++ b/daemons/clvmd/lvm-functions.c @@ -167,11 +167,15 @@ static struct lv_info *lookup_info(const char *resource) return lvi; } -static void insert_info(const char *resource, struct lv_info *lvi) +static int insert_info(const char *resource, struct lv_info *lvi) { + int ret; + pthread_mutex_lock(&lv_hash_lock); - dm_hash_insert(lv_hash, resource, lvi); + ret = dm_hash_insert(lv_hash, resource, lvi); pthread_mutex_unlock(&lv_hash_lock); + + return ret; } static void remove_info(const char *resource) @@ -277,8 +281,10 @@ static int hold_lock(char *resource, int mode, int flags) errno = saved_errno; } else { lvi = malloc(sizeof(struct lv_info)); - if (!lvi) + if (!lvi) { + errno = ENOMEM; return -1; + } lvi->lock_mode = mode; status = sync_lock(resource, mode, flags & ~LCKF_CONVERT, &lvi->lock_id); @@ -288,7 +294,10 @@ static int hold_lock(char *resource, int mode, int flags) DEBUGLOG("hold_lock. lock at %d failed: %s\n", mode, strerror(errno)); } else - insert_info(resource, lvi); + if (!insert_info(resource, lvi)) { + errno = ENOMEM; + return -1; + } errno = saved_errno; }