]> sourceware.org Git - lvm2.git/commitdiff
Add internal error to guard vgname2 NULL dereference
authorZdenek Kabelac <zkabelac@redhat.com>
Mon, 13 Feb 2012 14:26:15 +0000 (14:26 +0000)
committerZdenek Kabelac <zkabelac@redhat.com>
Mon, 13 Feb 2012 14:26:15 +0000 (14:26 +0000)
lib/cache/lvmcache.c

index 0de9734f9918480f6a6c4db518096e65124f14a3..856d03379ee09affefa2909eca49464a59e391d4 100644 (file)
@@ -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;
                }
        }
 
This page took 0.034501 seconds and 5 git commands to generate.