From nobody Sun Feb 8 05:54:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1531747527674847.0351451544841; Mon, 16 Jul 2018 06:25:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7F74A308403C; Mon, 16 Jul 2018 13:25:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 47044CA5F5; Mon, 16 Jul 2018 13:25:26 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EECD31853DA1; Mon, 16 Jul 2018 13:25:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6GDOpv1028174 for ; Mon, 16 Jul 2018 09:24:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8ACFC2027047; Mon, 16 Jul 2018 13:24:51 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCF9A2026D65; Mon, 16 Jul 2018 13:24:50 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 16 Jul 2018 14:24:09 +0100 Message-Id: <20180716132423.10354-24-berrange@redhat.com> In-Reply-To: <20180716132423.10354-1-berrange@redhat.com> References: <20180716132423.10354-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [go PATCH 23/37] secret: fix error reporting thread safety X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 16 Jul 2018 13:25:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Create wrapper functions for each secret C API that accepts a virErrorPtr parameter. This avoids accessing a thread local from a goroutine which may race with other goroutines doing native API calls in the same OS thread. Signed-off-by: Daniel P. Berrang=C3=A9 --- secret.go | 50 +++++++++------- secret_wrapper.go | 141 ++++++++++++++++++++++++++++++++++++++++++++++ secret_wrapper.h | 53 +++++++++++++++++ 3 files changed, 224 insertions(+), 20 deletions(-) diff --git a/secret.go b/secret.go index 9bd8b36..c4ef44b 100644 --- a/secret.go +++ b/secret.go @@ -67,27 +67,30 @@ type Secret struct { =20 // See also https://libvirt.org/html/libvirt-libvirt-secret.html#virSecret= Free func (s *Secret) Free() error { - ret :=3D C.virSecretFree(s.ptr) + var err C.virError + ret :=3D C.virSecretFreeWrapper(s.ptr, &err) if ret =3D=3D -1 { - return GetLastError() + return makeError(&err) } return nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-secret.html#virSecret= Ref func (c *Secret) Ref() error { - ret :=3D C.virSecretRef(c.ptr) + var err C.virError + ret :=3D C.virSecretRefWrapper(c.ptr, &err) if ret =3D=3D -1 { - return GetLastError() + return makeError(&err) } return nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-secret.html#virSecret= Undefine func (s *Secret) Undefine() error { - result :=3D C.virSecretUndefine(s.ptr) + var err C.virError + result :=3D C.virSecretUndefineWrapper(s.ptr, &err) if result =3D=3D -1 { - return GetLastError() + return makeError(&err) } return nil } @@ -96,9 +99,10 @@ func (s *Secret) Undefine() error { func (s *Secret) GetUUID() ([]byte, error) { var cUuid [C.VIR_UUID_BUFLEN](byte) cuidPtr :=3D unsafe.Pointer(&cUuid) - result :=3D C.virSecretGetUUID(s.ptr, (*C.uchar)(cuidPtr)) + var err C.virError + result :=3D C.virSecretGetUUIDWrapper(s.ptr, (*C.uchar)(cuidPtr), &err) if result !=3D 0 { - return []byte{}, GetLastError() + return []byte{}, makeError(&err) } return C.GoBytes(cuidPtr, C.VIR_UUID_BUFLEN), nil } @@ -107,36 +111,40 @@ func (s *Secret) GetUUID() ([]byte, error) { func (s *Secret) GetUUIDString() (string, error) { var cUuid [C.VIR_UUID_STRING_BUFLEN](C.char) cuidPtr :=3D unsafe.Pointer(&cUuid) - result :=3D C.virSecretGetUUIDString(s.ptr, (*C.char)(cuidPtr)) + var err C.virError + result :=3D C.virSecretGetUUIDStringWrapper(s.ptr, (*C.char)(cuidPtr), &e= rr) if result !=3D 0 { - return "", GetLastError() + return "", makeError(&err) } return C.GoString((*C.char)(cuidPtr)), nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-secret.html#virSecret= GetUsageID func (s *Secret) GetUsageID() (string, error) { - result :=3D C.virSecretGetUsageID(s.ptr) + var err C.virError + result :=3D C.virSecretGetUsageIDWrapper(s.ptr, &err) if result =3D=3D nil { - return "", GetLastError() + return "", makeError(&err) } return C.GoString(result), nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-secret.html#virSecret= GetUsageType func (s *Secret) GetUsageType() (SecretUsageType, error) { - result :=3D SecretUsageType(C.virSecretGetUsageType(s.ptr)) + var err C.virError + result :=3D SecretUsageType(C.virSecretGetUsageTypeWrapper(s.ptr, &err)) if result =3D=3D -1 { - return 0, GetLastError() + return 0, makeError(&err) } return result, nil } =20 // See also https://libvirt.org/html/libvirt-libvirt-secret.html#virSecret= GetXMLDesc func (s *Secret) GetXMLDesc(flags uint32) (string, error) { - result :=3D C.virSecretGetXMLDesc(s.ptr, C.uint(flags)) + var err C.virError + result :=3D C.virSecretGetXMLDescWrapper(s.ptr, C.uint(flags), &err) if result =3D=3D nil { - return "", GetLastError() + return "", makeError(&err) } xml :=3D C.GoString(result) C.free(unsafe.Pointer(result)) @@ -147,9 +155,10 @@ func (s *Secret) GetXMLDesc(flags uint32) (string, err= or) { func (s *Secret) GetValue(flags uint32) ([]byte, error) { var cvalue_size C.size_t =20 - cvalue :=3D C.virSecretGetValue(s.ptr, &cvalue_size, C.uint(flags)) + var err C.virError + cvalue :=3D C.virSecretGetValueWrapper(s.ptr, &cvalue_size, C.uint(flags)= , &err) if cvalue =3D=3D nil { - return nil, GetLastError() + return nil, makeError(&err) } defer C.free(unsafe.Pointer(cvalue)) ret :=3D C.GoBytes(unsafe.Pointer(cvalue), C.int(cvalue_size)) @@ -164,10 +173,11 @@ func (s *Secret) SetValue(value []byte, flags uint32)= error { cvalue[i] =3D C.uchar(value[i]) } =20 - result :=3D C.virSecretSetValue(s.ptr, &cvalue[0], C.size_t(len(value)), = C.uint(flags)) + var err C.virError + result :=3D C.virSecretSetValueWrapper(s.ptr, &cvalue[0], C.size_t(len(va= lue)), C.uint(flags), &err) =20 if result =3D=3D -1 { - return GetLastError() + return makeError(&err) } =20 return nil diff --git a/secret_wrapper.go b/secret_wrapper.go index 1bcc74d..96f60f6 100644 --- a/secret_wrapper.go +++ b/secret_wrapper.go @@ -30,5 +30,146 @@ package libvirt #include #include "secret_wrapper.h" =20 + +int +virSecretFreeWrapper(virSecretPtr secret, + virErrorPtr err) +{ + int ret =3D virSecretFree(secret); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +virConnectPtr +virSecretGetConnectWrapper(virSecretPtr secret, + virErrorPtr err) +{ + virConnectPtr ret =3D virSecretGetConnect(secret); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + +int +virSecretGetUUIDWrapper(virSecretPtr secret, + unsigned char *uuid, + virErrorPtr err) +{ + int ret =3D virSecretGetUUID(secret, uuid); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virSecretGetUUIDStringWrapper(virSecretPtr secret, + char *buf, + virErrorPtr err) +{ + int ret =3D virSecretGetUUIDString(secret, buf); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +const char * +virSecretGetUsageIDWrapper(virSecretPtr secret, + virErrorPtr err) +{ + const char * ret =3D virSecretGetUsageID(secret); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + +int +virSecretGetUsageTypeWrapper(virSecretPtr secret, + virErrorPtr err) +{ + int ret =3D virSecretGetUsageType(secret); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +unsigned char * +virSecretGetValueWrapper(virSecretPtr secret, + size_t *value_size, + unsigned int flags, + virErrorPtr err) +{ + unsigned char * ret =3D virSecretGetValue(secret, value_size, flags); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + +char * +virSecretGetXMLDescWrapper(virSecretPtr secret, + unsigned int flags, + virErrorPtr err) +{ + char * ret =3D virSecretGetXMLDesc(secret, flags); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + +int +virSecretRefWrapper(virSecretPtr secret, + virErrorPtr err) +{ + int ret =3D virSecretRef(secret); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virSecretSetValueWrapper(virSecretPtr secret, + const unsigned char *value, + size_t value_size, + unsigned int flags, + virErrorPtr err) +{ + int ret =3D virSecretSetValue(secret, value, value_size, flags); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + +int +virSecretUndefineWrapper(virSecretPtr secret, + virErrorPtr err) +{ + int ret =3D virSecretUndefine(secret); + if (ret < 0) { + virCopyLastError(err); + } + return ret; +} + + */ import "C" diff --git a/secret_wrapper.h b/secret_wrapper.h index 478c7d4..eca6f0a 100644 --- a/secret_wrapper.h +++ b/secret_wrapper.h @@ -30,4 +30,57 @@ #include #include "secret_compat.h" =20 +int +virSecretFreeWrapper(virSecretPtr secret, + virErrorPtr err); + +virConnectPtr +virSecretGetConnectWrapper(virSecretPtr secret, + virErrorPtr err); + +int +virSecretGetUUIDWrapper(virSecretPtr secret, + unsigned char *uuid, + virErrorPtr err); + +int +virSecretGetUUIDStringWrapper(virSecretPtr secret, + char *buf, + virErrorPtr err); + +const char * +virSecretGetUsageIDWrapper(virSecretPtr secret, + virErrorPtr err); + +int +virSecretGetUsageTypeWrapper(virSecretPtr secret, + virErrorPtr err); + +unsigned char * +virSecretGetValueWrapper(virSecretPtr secret, + size_t *value_size, + unsigned int flags, + virErrorPtr err); + +char * +virSecretGetXMLDescWrapper(virSecretPtr secret, + unsigned int flags, + virErrorPtr err); + +int +virSecretRefWrapper(virSecretPtr secret, + virErrorPtr err); + +int +virSecretSetValueWrapper(virSecretPtr secret, + const unsigned char *value, + size_t value_size, + unsigned int flags, + virErrorPtr err); + +int +virSecretUndefineWrapper(virSecretPtr secret, + virErrorPtr err); + + #endif /* LIBVIRT_GO_SECRET_WRAPPER_H__ */ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list