]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
sanlock: Use virStrcpy instead of virStrncpy
authorPeter Krempa <pkrempa@redhat.com>
Tue, 2 Mar 2021 11:12:11 +0000 (12:12 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 5 Mar 2021 14:01:29 +0000 (15:01 +0100)
We want a (possibly truncated) copy of the full source string so
virStrcpy is a better fit.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/locking/lock_driver_sanlock.c

index aaffe30e6ff0d2dd69b7fa6a20289232f90e93d3..1d8f1093757fb140530f751b0f2348c8f300fe14 100644 (file)
@@ -924,9 +924,7 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock,
 
     /* sanlock doesn't use owner_name for anything, so it's safe to take just
      * the first SANLK_NAME_LEN - 1 characters from vm_name */
-    ignore_value(virStrncpy(opt->owner_name, priv->vm_name,
-                            MIN(strlen(priv->vm_name), SANLK_NAME_LEN - 1),
-                            SANLK_NAME_LEN));
+    virStrcpy(opt->owner_name, priv->vm_name, SANLK_NAME_LEN);
 
     if (state && STRNEQ(state, "")) {
         if ((rv = sanlock_state_to_args((char *)state,