From nobody Mon Feb 9 03:14:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612285150; cv=none; d=zohomail.com; s=zohoarc; b=TyDGfzADramoqO7F3v+IsvXdzo51g5XatI68+/wPd0Be1ZqFDKyTWO7jQNieqIlqnSBAY6lkX+w53xWa1Zx3OSsLxUkdPbjejilvdDxG0aG6md2wZkTp5j1sn35s1US2qYvmBkzjxwV7fPAO4rheD64EZ4ESAaqx9IE9PRsf1mY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612285150; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J8kpIPE5d+tOerHbDqqldAcuuZ7vDUNGzFxIkzzps6Y=; b=Jp9D9ah+yLTJv1rKal8+nfdr/HTVk1AQ+LQcT2xyPT6gOUQ55F+7CeWAXHzFd1LbBilmsXsFX6a9PmblJJXxi3V94X7k9lS8XuErQQiLrw1oHytDF+zFlpUJn/SrC89hGvZbxQyCHY+g9t4TujPwGH7RZmml4yXELVV7a9qcky4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612285150272707.0146148106526; Tue, 2 Feb 2021 08:59:10 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-23-GX-MSjIjPx20MNwenyqepQ-1; Tue, 02 Feb 2021 11:56:47 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A7D731800D50; Tue, 2 Feb 2021 16:56:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8635D6E510; Tue, 2 Feb 2021 16:56:41 +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 4D84850040; Tue, 2 Feb 2021 16:56:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 112GueqY015007 for ; Tue, 2 Feb 2021 11:56:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id 45A316EF50; Tue, 2 Feb 2021 16:56:40 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C2706E510 for ; Tue, 2 Feb 2021 16:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612285149; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=J8kpIPE5d+tOerHbDqqldAcuuZ7vDUNGzFxIkzzps6Y=; b=HBPMbIu0qA2yLRjvy2dMyEY0lH0EVbAUosccyELCbWcxpu4yuoT+pK2Os+8A/BDdiDTzM2 WpU8iexbw8NvIszAOFMtStME91kWCGSVOGQaG/JklhckvfH+6Ct8mIE7ZVV2H6lSH2SIPz 5TjexX8+X4Hg/p/aIMbey6450KAfpVU= X-MC-Unique: GX-MSjIjPx20MNwenyqepQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 10/27] libxlMakeNetworkDiskSrc: Avoid use of VIR_DISPOSE_N Date: Tue, 2 Feb 2021 17:55:47 +0100 Message-Id: <5dcd97a624b06a93518ba467a2b0bed0791d98e0.1612284661.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Clear the secret right after use with virSecureErase. Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrang=C3=A9 --- src/libxl/libxl_conf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index cb1fd7df7d..694192e1c3 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -46,6 +46,7 @@ #include "xen_xl.h" #include "virnetdevvportprofile.h" #include "virenum.h" +#include "virsecureerase.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -998,14 +999,15 @@ static int libxlMakeNetworkDiskSrc(virStorageSourcePtr src, char **srcstr) { virConnectPtr conn =3D NULL; - uint8_t *secret =3D NULL; VIR_AUTODISPOSE_STR base64secret =3D NULL; - size_t secretlen =3D 0; char *username =3D NULL; int ret =3D -1; *srcstr =3D NULL; if (src->auth && src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_RBD) { + g_autofree uint8_t *secret =3D NULL; + size_t secretlen =3D 0; + username =3D src->auth->username; if (!(conn =3D virConnectOpen("xen:///system"))) goto cleanup; @@ -1017,6 +1019,7 @@ libxlMakeNetworkDiskSrc(virStorageSourcePtr src, char= **srcstr) /* RBD expects an encoded secret */ base64secret =3D g_base64_encode(secret, secretlen); + virSecureErase(secret, secretlen); } if (!(*srcstr =3D libxlMakeNetworkDiskSrcStr(src, username, base64secr= et))) @@ -1025,7 +1028,6 @@ libxlMakeNetworkDiskSrc(virStorageSourcePtr src, char= **srcstr) ret =3D 0; cleanup: - VIR_DISPOSE_N(secret, secretlen); virObjectUnref(conn); return ret; } --=20 2.29.2