From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 30 Aug 2011 16:24:06 +0000 (-0400)
Subject: Fix incorrect path length check in sanlock lockspace setup
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2223b1f71ff52c8b4e73b4a0c5d02f81b317e923;p=libvirt.git

Fix incorrect path length check in sanlock lockspace setup

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
---

diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index b85f1fa434..b93fe010aa 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -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;