]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Use virStrcpy in qemuNodeGetSecurityModel()
authorMichal Privoznik <mprivozn@redhat.com>
Wed, 21 Aug 2019 09:41:28 +0000 (11:41 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 4 Jan 2021 19:17:55 +0000 (20:17 +0100)
The code we have there to copy seclabel model or doi can be
replaced by virStrcpy() calls which do exactly the same checks.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_driver.c

index a37682485453a718187b7ccdce6e9d8277d741a6..a9e8f660c762c83d371e4468af7c652bbd02b142 100644 (file)
@@ -5930,7 +5930,6 @@ static int qemuNodeGetSecurityModel(virConnectPtr conn,
                                     virSecurityModelPtr secmodel)
 {
     virQEMUDriverPtr driver = conn->privateData;
-    char *p;
     g_autoptr(virCaps) caps = NULL;
 
     memset(secmodel, 0, sizeof(*secmodel));
@@ -5946,23 +5945,21 @@ static int qemuNodeGetSecurityModel(virConnectPtr conn,
         caps->host.secModels[0].model == NULL)
         return 0;
 
-    p = caps->host.secModels[0].model;
-    if (strlen(p) >= VIR_SECURITY_MODEL_BUFLEN-1) {
+    if (virStrcpy(secmodel->model, caps->host.secModels[0].model,
+                  VIR_SECURITY_MODEL_BUFLEN) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("security model string exceeds max %d bytes"),
-                       VIR_SECURITY_MODEL_BUFLEN-1);
+                       VIR_SECURITY_MODEL_BUFLEN - 1);
         return -1;
     }
-    strcpy(secmodel->model, p);
 
-    p = caps->host.secModels[0].doi;
-    if (strlen(p) >= VIR_SECURITY_DOI_BUFLEN-1) {
+    if (virStrcpy(secmodel->doi, caps->host.secModels[0].doi,
+                  VIR_SECURITY_DOI_BUFLEN) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("security DOI string exceeds max %d bytes"),
-                       VIR_SECURITY_DOI_BUFLEN-1);
+                       VIR_SECURITY_DOI_BUFLEN - 1);
         return -1;
     }
-    strcpy(secmodel->doi, p);
 
     return 0;
 }