From nobody Fri May 17 09:19:00 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=reject dis=none) header.from=linux.ibm.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 17121367634490.5483049363888313; Wed, 3 Apr 2024 02:32:43 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E83521972; Wed, 3 Apr 2024 05:32:41 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7BC92198B; Wed, 3 Apr 2024 05:31:56 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 786F0181C; Wed, 3 Apr 2024 05:31:53 -0400 (EDT) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id AE7AD181C for ; Wed, 3 Apr 2024 05:31:50 -0400 (EDT) Received: from pps.filterd (m0353728.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43391E3o020600 for ; Wed, 3 Apr 2024 09:31:49 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3x93m104dv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 03 Apr 2024 09:31:49 +0000 Received: from m0353728.ppops.net (m0353728.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 4339VmrA011294 for ; Wed, 3 Apr 2024 09:31:48 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3x93m104dr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 03 Apr 2024 09:31:48 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 4338GRuc027143; Wed, 3 Apr 2024 09:26:47 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3x6wf0cmge-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 03 Apr 2024 09:26:47 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 4339QfVA34407102 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 3 Apr 2024 09:26:44 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C563020043; Wed, 3 Apr 2024 09:26:41 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9F31D20040; Wed, 3 Apr 2024 09:26:41 +0000 (GMT) Received: from li-1de7cd4c-3205-11b2-a85c-d27f97db1fe1.boeblingen.de.ibm.com (unknown [9.152.224.248]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 3 Apr 2024 09:26:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 From: Marc Hartmayer To: Subject: [PATCH v1] node_device_conf: virNodeDeviceGetSCSITargetCaps: fix memory leak Date: Wed, 3 Apr 2024 11:26:29 +0200 Message-ID: <20240403092629.30742-1-mhartmay@linux.ibm.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 5FIf9nb-gI2qoqSnZmRmCNTLNZZ7BXKo X-Proofpoint-GUID: AlWSOasFd_QvihuYSE_AWnsFOqlWOfzV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-03_08,2024-04-01_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 spamscore=0 mlxlogscore=865 adultscore=0 priorityscore=1501 phishscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2403210000 definitions=main-2404030065 Message-ID-Hash: YFBAHMB5YUQRCPKFXABZXCPBBGPCOMFR X-Message-ID-Hash: YFBAHMB5YUQRCPKFXABZXCPBBGPCOMFR X-MailFrom: mhartmay@linux.ibm.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Boris Fiuczynski , Bjoern Walk , =?UTF-8?q?J=C3=A1n=20Tomko?= X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1712136764500100001 Make sure the old value in `scsi_target->wwpn` is free'd before replacing i= t. =3D=3D9104=3D=3D 38 bytes in 2 blocks are definitely lost in loss record 1,= 943 of 3,250 =3D=3D9104=3D=3D at 0x483B8C0: malloc (vg_replace_malloc.c:442) =3D=3D9104=3D=3D by 0x4DFB69B: g_malloc (gmem.c:130) =3D=3D9104=3D=3D by 0x4E1921D: g_strdup (gstrfuncs.c:363) =3D=3D9104=3D=3D by 0x495D60B: g_strdup_inline (gstrfuncs.h:321) =3D=3D9104=3D=3D by 0x495D60B: virFCReadRportValue (virfcp.c:62) =3D=3D9104=3D=3D by 0x4A5F5CB: virNodeDeviceGetSCSITargetCaps (node_devi= ce_conf.c:2914) =3D=3D9104=3D=3D by 0xBF62529: udevProcessSCSITarget (node_device_udev.c= :657) =3D=3D9104=3D=3D by 0xBF62529: udevGetDeviceDetails (node_device_udev.c:= 1406) =3D=3D9104=3D=3D by 0xBF62529: udevAddOneDevice (node_device_udev.c:1563) =3D=3D9104=3D=3D by 0xBF639B5: udevProcessDeviceListEntry (node_device_u= dev.c:1637) =3D=3D9104=3D=3D by 0xBF639B5: udevEnumerateDevices (node_device_udev.c:= 1691) =3D=3D9104=3D=3D by 0xBF639B5: nodeStateInitializeEnumerate (node_device= _udev.c:2009) =3D=3D9104=3D=3D by 0x49BDBFD: virThreadHelper (virthread.c:256) =3D=3D9104=3D=3D by 0x5242069: start_thread (in /usr/lib64/libc.so.6) Signed-off-by: Marc Hartmayer Reviewed-by: Jonathon Jongsma --- src/conf/node_device_conf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 32b69aae84f3..14504cbb9c1f 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2897,6 +2897,7 @@ virNodeDeviceGetSCSITargetCaps(const char *sysfsPath, int ret =3D -1; g_autofree char *dir =3D NULL; g_autofree char *rport =3D NULL; + g_autofree char *wwpn =3D NULL; =20 VIR_DEBUG("Checking if '%s' is an FC remote port", scsi_target->name); =20 @@ -2912,11 +2913,13 @@ virNodeDeviceGetSCSITargetCaps(const char *sysfsPat= h, scsi_target->rport =3D g_steal_pointer(&rport); =20 if (virFCReadRportValue(scsi_target->rport, "port_name", - &scsi_target->wwpn) < 0) { + &wwpn) < 0) { VIR_WARN("Failed to read port_name for '%s'", scsi_target->rport); goto cleanup; } =20 + VIR_FREE(scsi_target->wwpn); + scsi_target->wwpn =3D g_steal_pointer(&wwpn); scsi_target->flags |=3D VIR_NODE_DEV_CAP_FLAG_FC_RPORT; ret =3D 0; =20 base-commit: b902cfece0db71c3421b0bfe0e05d1dbe7890c31 --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org