]> xenbits.xensource.com Git - libvirt.git/commitdiff
Fix incorrect path length check in sanlock lockspace setup
authorDaniel P. Berrange <berrange@redhat.com>
Tue, 30 Aug 2011 16:24:06 +0000 (12:24 -0400)
committerDaniel P. Berrange <berrange@redhat.com>
Wed, 31 Aug 2011 10:07:31 +0000 (11:07 +0100)
The code for creating a sanlock lockspace accidentally used
SANLK_NAME_LEN instead of SANLK_PATH_LEN for a size check.
This meant disk paths were limited to 48 bytes !

* src/locking/lock_driver_sanlock.c: Fix disk path length
  check

src/locking/lock_driver_sanlock.c

index b85f1fa434513abf520c2c2da78f6f0f01ea7795..b93fe010aa9962003fce2dbe51e812dcf6a78f5c 100644 (file)
@@ -159,10 +159,10 @@ static int virLockManagerSanlockSetupLockspace(void)
     memcpy(ls.name, VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE, SANLK_NAME_LEN);
     ls.host_id = 0; /* Doesn't matter for initialization */
     ls.flags = 0;
-    if (!virStrcpy(ls.host_id_disk.path, path, SANLK_NAME_LEN)) {
+    if (!virStrcpy(ls.host_id_disk.path, path, SANLK_PATH_LEN)) {
         virLockError(VIR_ERR_INTERNAL_ERROR,
                      _("Lockspace path '%s' exceeded %d characters"),
-                     path, SANLK_NAME_LEN);
+                     path, SANLK_PATH_LEN);
         goto error;
     }
     ls.host_id_disk.offset = 0;