summaryrefslogtreecommitdiffstats
path: root/lib/cache/lvmcache.c
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2012-02-13 14:26:15 +0000
committerZdenek Kabelac <zkabelac@redhat.com>2012-02-13 14:26:15 +0000
commit382a1a6beab2d5196d60b74800cd97fa8b205992 (patch)
tree83ae7df461dfdaa9ed9799532c6ce779f9ca1719 /lib/cache/lvmcache.c
parent99e2a2e1569c898d39565a52ec60f8a167cf523e (diff)
downloadlvm2-382a1a6beab2d5196d60b74800cd97fa8b205992.tar.gz
lvm2-382a1a6beab2d5196d60b74800cd97fa8b205992.tar.xz
lvm2-382a1a6beab2d5196d60b74800cd97fa8b205992.zip
Add internal error to guard vgname2 NULL dereference
Diffstat (limited to 'lib/cache/lvmcache.c')
-rw-r--r--lib/cache/lvmcache.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c
index 0de9734f..856d0337 100644
--- a/lib/cache/lvmcache.c
+++ b/lib/cache/lvmcache.c
@@ -321,13 +321,17 @@ int lvmcache_verify_lock_order(const char *vgname)
if (!dm_hash_get_data(_lock_hash, n))
return_0;
- vgname2 = dm_hash_get_key(_lock_hash, n);
+ if (!(vgname2 = dm_hash_get_key(_lock_hash, n))) {
+ log_error(INTERNAL_ERROR "VG lock %s hits NULL.",
+ vgname);
+ return 0;
+ }
if (!_vgname_order_correct(vgname2, vgname)) {
log_errno(EDEADLK, INTERNAL_ERROR "VG lock %s must "
"be requested before %s, not after.",
vgname, vgname2);
- return_0;
+ return 0;
}
}