From nobody Mon May 13 11:33:14 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 17115584333445.0811915158196825; Wed, 27 Mar 2024 09:53:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id AB91C1F8B; Wed, 27 Mar 2024 12:53:51 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 29C591E28; Wed, 27 Mar 2024 12:53:11 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 885EE1E0B; Wed, 27 Mar 2024 12:53:08 -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 45A591DF9 for ; Wed, 27 Mar 2024 12:53:07 -0400 (EDT) Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 42RFMkvW026628 for ; Wed, 27 Mar 2024 16:53:06 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3x4p1n86fp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Mar 2024 16:53:05 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 42RGr5ku016740 for ; Wed, 27 Mar 2024 16:53:05 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3x4p1n86fg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 Mar 2024 16:53:05 +0000 Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 42RExjp8011328; Wed, 27 Mar 2024 16:53:04 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3x2bmm7ffy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 Mar 2024 16:53:04 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 42RGqxs936634982 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 Mar 2024 16:53:01 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4191B2004B; Wed, 27 Mar 2024 16:52:59 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E9FCB20040; Wed, 27 Mar 2024 16:52:58 +0000 (GMT) Received: from li-1de7cd4c-3205-11b2-a85c-d27f97db1fe1.ibm.com.com (unknown [9.171.22.7]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 27 Mar 2024 16:52:58 +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: [RFC PATCH 1/2] node_device_conf: virNodeDeviceGetSCSITargetCaps: fix memory leak Date: Wed, 27 Mar 2024 17:48:27 +0100 Message-ID: <20240327164828.100104-2-mhartmay@linux.ibm.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240327164828.100104-1-mhartmay@linux.ibm.com> References: <20240327164828.100104-1-mhartmay@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: GTD6ZJvfOoOhIejA4cYp6e-tXC--SNxb X-Proofpoint-GUID: GcjFQL6yvw9znRejCbRQhJkLwqnIYOno 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-03-27_13,2024-03-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 spamscore=0 phishscore=0 priorityscore=1501 impostorscore=0 adultscore=0 suspectscore=0 mlxlogscore=856 clxscore=1015 malwarescore=0 bulkscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2403210000 definitions=main-2403270117 Message-ID-Hash: RMZ76HTMKAUVYTKIGFOHPWZHLGORNF33 X-Message-ID-Hash: RMZ76HTMKAUVYTKIGFOHPWZHLGORNF33 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 , =?UTF-8?q?Michal=20Pr=C3=ADvozn=C3=ADk?= 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: 1711558434447100001 Make sure the old value in `scsi_target->wwpn` is free'd before replacing i= t. While at it, simplify the code. =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 --- src/conf/node_device_conf.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 48140b17baa5..c146a9f0c881 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2894,9 +2894,9 @@ int virNodeDeviceGetSCSITargetCaps(const char *sysfsPath, virNodeDevCapSCSITarget *scsi_target) { - 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 @@ -2906,28 +2906,21 @@ virNodeDeviceGetSCSITargetCaps(const char *sysfsPat= h, rport =3D g_path_get_basename(dir); =20 if (!virFCIsCapableRport(rport)) - goto cleanup; + return -1; + + if (virFCReadRportValue(rport, "port_name", + &wwpn) < 0) { + VIR_WARN("Failed to read port_name for '%s'", rport); + return -1; + } =20 VIR_FREE(scsi_target->rport); scsi_target->rport =3D g_steal_pointer(&rport); =20 - if (virFCReadRportValue(scsi_target->rport, "port_name", - &scsi_target->wwpn) < 0) { - VIR_WARN("Failed to read port_name for '%s'", scsi_target->rport); - goto cleanup; - } - + 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; - - cleanup: - if (ret < 0) { - VIR_FREE(scsi_target->rport); - VIR_FREE(scsi_target->wwpn); - scsi_target->flags &=3D ~VIR_NODE_DEV_CAP_FLAG_FC_RPORT; - } - - return ret; + return 0; } =20 =20 --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Mon May 13 11:33:14 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 1711558462511616.3257753403628; Wed, 27 Mar 2024 09:54:22 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 45FAC1EBE; Wed, 27 Mar 2024 12:54:21 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D86D21F59; Wed, 27 Mar 2024 12:53:15 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A27AF1DF9; Wed, 27 Mar 2024 12:53:09 -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 16FD21E0B for ; Wed, 27 Mar 2024 12:53:09 -0400 (EDT) Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 42RFUERb004318 for ; Wed, 27 Mar 2024 16:53:08 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3x4p1n86fv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Mar 2024 16:53:07 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 42RGr65C016768 for ; Wed, 27 Mar 2024 16:53:06 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 3x4p1n86fn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 Mar 2024 16:53:06 +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 42RFmX62013358; Wed, 27 Mar 2024 16:53:05 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3x29t0r1hy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 Mar 2024 16:53:05 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 42RGqxxw42009074 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 Mar 2024 16:53:01 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A222E2004D; Wed, 27 Mar 2024 16:52:59 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5A6DB20040; Wed, 27 Mar 2024 16:52:59 +0000 (GMT) Received: from li-1de7cd4c-3205-11b2-a85c-d27f97db1fe1.ibm.com.com (unknown [9.171.22.7]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 27 Mar 2024 16:52:59 +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: [RFC PATCT 2/2] TODO virNodeDeviceUpdateCaps: checks missing? Date: Wed, 27 Mar 2024 17:48:28 +0100 Message-ID: <20240327164828.100104-3-mhartmay@linux.ibm.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240327164828.100104-1-mhartmay@linux.ibm.com> References: <20240327164828.100104-1-mhartmay@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: kG_nO6GIqqMVSIYNxhrLbsVq3UELcYPC X-Proofpoint-GUID: nyuseM2yJvD4JNnEzU2gb_55IRlliQGG 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-03-27_13,2024-03-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 spamscore=0 phishscore=0 priorityscore=1501 impostorscore=0 adultscore=0 suspectscore=0 mlxlogscore=839 clxscore=1015 malwarescore=0 bulkscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2403210000 definitions=main-2403270117 Message-ID-Hash: KU34EE6BL6ZHRA2D57LFOTLLGT4QE5EB X-Message-ID-Hash: KU34EE6BL6ZHRA2D57LFOTLLGT4QE5EB 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 , =?UTF-8?q?Michal=20Pr=C3=ADvozn=C3=ADk?= 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: 1711558464561100001 I'm not familiar with the code so I cannot decide if ignoring the return va= lues is a bug or not. At least, it looks awkward and should be annotated. Signed-off-by: Marc Hartmayer --- src/conf/node_device_conf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index c146a9f0c881..2f9abf5d9938 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2646,11 +2646,13 @@ virNodeDeviceUpdateCaps(virNodeDeviceDef *def) while (cap) { switch (cap->data.type) { case VIR_NODE_DEV_CAP_SCSI_HOST: - virNodeDeviceGetSCSIHostCaps(&cap->data.scsi_host); + if (virNodeDeviceGetSCSIHostCaps(&cap->data.scsi_host) < 0) + return -1; break; case VIR_NODE_DEV_CAP_SCSI_TARGET: - virNodeDeviceGetSCSITargetCaps(def->sysfs_path, - &cap->data.scsi_target); + if (virNodeDeviceGetSCSITargetCaps(def->sysfs_path, + &cap->data.scsi_target) < 0) + return -1; break; case VIR_NODE_DEV_CAP_NET: if (virNetDevGetLinkInfo(cap->data.net.ifname, --=20 2.34.1 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org