From nobody Tue Apr 30 06:01:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495019709970950.7021618089211; Wed, 17 May 2017 04:15:09 -0700 (PDT) Received: from localhost ([::1]:46935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAwv4-0002nG-Cr for importer@patchew.org; Wed, 17 May 2017 07:15:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAwtF-0001bC-DU for qemu-devel@nongnu.org; Wed, 17 May 2017 07:13:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAwtC-0001m5-O3 for qemu-devel@nongnu.org; Wed, 17 May 2017 07:13:13 -0400 Received: from [59.151.112.132] (port=34797 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAwtB-0001lQ-OX for qemu-devel@nongnu.org; Wed, 17 May 2017 07:13:10 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 17 May 2017 19:13:00 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 9734E47C6524; Wed, 17 May 2017 19:13:00 +0800 (CST) Received: from maozy.g08.fujitsu.local (10.167.225.76) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 17 May 2017 19:12:59 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18966434" From: Mao Zhongyi To: Date: Wed, 17 May 2017 19:12:23 +0800 Message-ID: <7b167e0f406b66ae11313d4cde04396952d0902f.1495018956.git.maozy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: 9734E47C6524.A083E X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: maozy.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH v4 1/3] net/rocker: Remove the dead error handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jasowang@redhat.com, jiri@resnulli.us, f4bug@amsat.org, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The function of_dpa_world_alloc is a wrapper around world_alloc(), which returns null only when g_malloc0(size_t size) does. But g_malloc0() also is a wrapper around g_malloc0_n(1, size) that ignore the fact that g_malloc0() of 0 bytes, it doesn't returns null. So the error handling is dead. Similar like desc_ring_alloc(), fp_port_alloc() etc. Remove these entirely. Cc: jasowang@redhat.com Cc: jiri@resnulli.us Cc: f4bug@amsat.org Cc: armbru@redhat.com Signed-off-by: Mao Zhongyi --- hw/net/rocker/rocker.c | 32 -------------------------------- hw/net/rocker/rocker_desc.c | 3 --- hw/net/rocker/rocker_fp.c | 4 ---- 3 files changed, 39 deletions(-) diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 6e70fdd..b2b6dc7 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -1313,13 +1313,6 @@ static int pci_rocker_init(PCIDevice *dev) =20 r->worlds[ROCKER_WORLD_TYPE_OF_DPA] =3D of_dpa_world_alloc(r); =20 - for (i =3D 0; i < ROCKER_WORLD_TYPE_MAX; i++) { - if (!r->worlds[i]) { - err =3D -ENOMEM; - goto err_world_alloc; - } - } - if (!r->world_name) { r->world_name =3D g_strdup(world_name(r->worlds[ROCKER_WORLD_TYPE_= OF_DPA])); } @@ -1396,9 +1389,6 @@ static int pci_rocker_init(PCIDevice *dev) } =20 r->rings =3D g_new(DescRing *, rocker_pci_ring_count(r)); - if (!r->rings) { - goto err_rings_alloc; - } =20 /* Rings are ordered like this: * - command ring @@ -1410,14 +1400,9 @@ static int pci_rocker_init(PCIDevice *dev) * ..... */ =20 - err =3D -ENOMEM; for (i =3D 0; i < rocker_pci_ring_count(r); i++) { DescRing *ring =3D desc_ring_alloc(r, i); =20 - if (!ring) { - goto err_ring_alloc; - } - if (i =3D=3D ROCKER_RING_CMD) { desc_ring_set_consume(ring, cmd_consume, ROCKER_MSIX_VEC_CMD); } else if (i =3D=3D ROCKER_RING_EVENT) { @@ -1437,10 +1422,6 @@ static int pci_rocker_init(PCIDevice *dev) fp_port_alloc(r, r->name, &r->fp_start_macaddr, i, &r->fp_ports_peers[i]); =20 - if (!port) { - goto err_port_alloc; - } - r->fp_port[i] =3D port; fp_port_set_world(port, r->world_dflt); } @@ -1449,25 +1430,12 @@ static int pci_rocker_init(PCIDevice *dev) =20 return 0; =20 -err_port_alloc: - for (--i; i >=3D 0; i--) { - FpPort *port =3D r->fp_port[i]; - fp_port_free(port); - } - i =3D rocker_pci_ring_count(r); -err_ring_alloc: - for (--i; i >=3D 0; i--) { - desc_ring_free(r->rings[i]); - } - g_free(r->rings); -err_rings_alloc: err_duplicate: rocker_msix_uninit(r); err_msix_init: object_unparent(OBJECT(&r->msix_bar)); object_unparent(OBJECT(&r->mmio)); err_world_type_by_name: -err_world_alloc: for (i =3D 0; i < ROCKER_WORLD_TYPE_MAX; i++) { if (r->worlds[i]) { world_free(r->worlds[i]); diff --git a/hw/net/rocker/rocker_desc.c b/hw/net/rocker/rocker_desc.c index ac02797..bd7e364 100644 --- a/hw/net/rocker/rocker_desc.c +++ b/hw/net/rocker/rocker_desc.c @@ -347,9 +347,6 @@ DescRing *desc_ring_alloc(Rocker *r, int index) DescRing *ring; =20 ring =3D g_new0(DescRing, 1); - if (!ring) { - return NULL; - } =20 ring->r =3D r; ring->index =3D index; diff --git a/hw/net/rocker/rocker_fp.c b/hw/net/rocker/rocker_fp.c index 1305ac3..4b3c984 100644 --- a/hw/net/rocker/rocker_fp.c +++ b/hw/net/rocker/rocker_fp.c @@ -226,10 +226,6 @@ FpPort *fp_port_alloc(Rocker *r, char *sw_name, { FpPort *port =3D g_new0(FpPort, 1); =20 - if (!port) { - return NULL; - } - port->r =3D r; port->index =3D index; port->pport =3D index + 1; --=20 2.9.3 From nobody Tue Apr 30 06:01:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495019702991784.3706950371809; Wed, 17 May 2017 04:15:02 -0700 (PDT) Received: from localhost ([::1]:46934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAwuz-0002io-Ao for importer@patchew.org; Wed, 17 May 2017 07:15:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAwtF-0001bD-E3 for qemu-devel@nongnu.org; Wed, 17 May 2017 07:13:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAwtD-0001mP-UX for qemu-devel@nongnu.org; Wed, 17 May 2017 07:13:13 -0400 Received: from [59.151.112.132] (port=34797 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAwtD-0001lQ-Hp for qemu-devel@nongnu.org; Wed, 17 May 2017 07:13:11 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 17 May 2017 19:13:06 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 4C4CD47C6524; Wed, 17 May 2017 19:13:01 +0800 (CST) Received: from maozy.g08.fujitsu.local (10.167.225.76) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 17 May 2017 19:13:00 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18966438" From: Mao Zhongyi To: Date: Wed, 17 May 2017 19:12:24 +0800 Message-ID: X-Mailer: git-send-email 2.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: 4C4CD47C6524.A00EF X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: maozy.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH v4 2/3] net/rocker: Plug memory leak in pci_rocker_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jasowang@redhat.com, jiri@resnulli.us, f4bug@amsat.org, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" pci_rocker_init() leaks a World when the name more than 9 chars, then return a negative value directly, doesn't make a correct cleanup. So add a new goto label to fix it. Cc: jasowang@redhat.com Cc: jiri@resnulli.us Cc: f4bug@amsat.org Cc: armbru@redhat.com Signed-off-by: Mao Zhongyi --- hw/net/rocker/rocker.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index b2b6dc7..a382a6f 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -1371,7 +1371,8 @@ static int pci_rocker_init(PCIDevice *dev) fprintf(stderr, "rocker: name too long; please shorten to at most %d chars= \n", MAX_ROCKER_NAME_LEN); - return -EINVAL; + err =3D -EINVAL; + goto err_name_too_long; } =20 if (memcmp(&r->fp_start_macaddr, &zero, sizeof(zero)) =3D=3D 0) { @@ -1430,6 +1431,7 @@ static int pci_rocker_init(PCIDevice *dev) =20 return 0; =20 +err_name_too_long: err_duplicate: rocker_msix_uninit(r); err_msix_init: --=20 2.9.3 From nobody Tue Apr 30 06:01:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495019710149225.67869532888312; Wed, 17 May 2017 04:15:10 -0700 (PDT) Received: from localhost ([::1]:46936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAwv6-0002pw-Kt for importer@patchew.org; Wed, 17 May 2017 07:15:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36282) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAwtJ-0001cu-D4 for qemu-devel@nongnu.org; Wed, 17 May 2017 07:13:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAwtD-0001mI-FC for qemu-devel@nongnu.org; Wed, 17 May 2017 07:13:17 -0400 Received: from [59.151.112.132] (port=20783 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAwtD-0001kb-1v for qemu-devel@nongnu.org; Wed, 17 May 2017 07:13:11 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 17 May 2017 19:13:06 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 054A947C6555; Wed, 17 May 2017 19:13:02 +0800 (CST) Received: from maozy.g08.fujitsu.local (10.167.225.76) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 17 May 2017 19:13:01 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18966437" From: Mao Zhongyi To: Date: Wed, 17 May 2017 19:12:25 +0800 Message-ID: <645c1b3e6fc23605365c0685d94ec50df7a7fd2b.1495018956.git.maozy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: 054A947C6555.AFAA0 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: maozy.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH v4 3/3] net/rocker: Convert to realize() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jasowang@redhat.com, jiri@resnulli.us, f4bug@amsat.org, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The rocker device still implements the old PCIDeviceClass .init() instead of the new .realize(). All devices need to be converted to .realize(). .init() reports errors with fprintf() and return 0 on success, negative number on failure. Meanwhile, when -device rocker fails, it first report a specific error, then a generic one, like this: $ x86_64-softmmu/qemu-system-x86_64 -device rocker,name=3Dqemu-rocker rocker: name too long; please shorten to at most 9 chars qemu-system-x86_64: -device rocker,name=3Dqemu-rocker: Device initializ= ation failed Now, convert it to .realize() that passes errors to its callers via its errp argument. Also avoid the superfluous second error message. After the patch, effect like this: $ x86_64-softmmu/qemu-system-x86_64 -device rocker,name=3Dqemu-rocker qemu-system-x86_64: -device rocker,name=3Dqemu-rocker: name too long; p= lease shorten to at most 9 chars Cc: jasowang@redhat.com Cc: jiri@resnulli.us Cc: f4bug@amsat.org Cc: armbru@redhat.com Signed-off-by: Mao Zhongyi --- hw/net/rocker/rocker.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index a382a6f..b9a77f1 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -1252,20 +1252,18 @@ rollback: return err; } =20 -static int rocker_msix_init(Rocker *r) +static int rocker_msix_init(Rocker *r, Error **errp) { PCIDevice *dev =3D PCI_DEVICE(r); int err; - Error *local_err =3D NULL; =20 err =3D msix_init(dev, ROCKER_MSIX_VEC_COUNT(r->fp_ports), &r->msix_bar, ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_TABLE_OFFSET, &r->msix_bar, ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_PBA_OFFSET, - 0, &local_err); + 0, errp); if (err) { - error_report_err(local_err); return err; } =20 @@ -1301,7 +1299,7 @@ static World *rocker_world_type_by_name(Rocker *r, co= nst char *name) return NULL; } =20 -static int pci_rocker_init(PCIDevice *dev) +static void pci_rocker_realize(PCIDevice *dev, Error **errp) { Rocker *r =3D to_rocker(dev); const MACAddr zero =3D { .a =3D { 0, 0, 0, 0, 0, 0 } }; @@ -1319,10 +1317,9 @@ static int pci_rocker_init(PCIDevice *dev) =20 r->world_dflt =3D rocker_world_type_by_name(r, r->world_name); if (!r->world_dflt) { - fprintf(stderr, - "rocker: requested world \"%s\" does not exist\n", + error_setg(errp, + "invalid argument requested world %s does not exist", r->world_name); - err =3D -EINVAL; goto err_world_type_by_name; } =20 @@ -1342,7 +1339,7 @@ static int pci_rocker_init(PCIDevice *dev) =20 /* MSI-X init */ =20 - err =3D rocker_msix_init(r); + err =3D rocker_msix_init(r, errp); if (err) { goto err_msix_init; } @@ -1354,7 +1351,7 @@ static int pci_rocker_init(PCIDevice *dev) } =20 if (rocker_find(r->name)) { - err =3D -EEXIST; + error_setg(errp, "%s already exists", r->name); goto err_duplicate; } =20 @@ -1368,10 +1365,9 @@ static int pci_rocker_init(PCIDevice *dev) #define ROCKER_IFNAMSIZ 16 #define MAX_ROCKER_NAME_LEN (ROCKER_IFNAMSIZ - 1 - 3 - 3) if (strlen(r->name) > MAX_ROCKER_NAME_LEN) { - fprintf(stderr, - "rocker: name too long; please shorten to at most %d chars= \n", + error_setg(errp, + "name too long; please shorten to at most %d chars", MAX_ROCKER_NAME_LEN); - err =3D -EINVAL; goto err_name_too_long; } =20 @@ -1429,7 +1425,7 @@ static int pci_rocker_init(PCIDevice *dev) =20 QLIST_INSERT_HEAD(&rockers, r, next); =20 - return 0; + return; =20 err_name_too_long: err_duplicate: @@ -1443,7 +1439,6 @@ err_world_type_by_name: world_free(r->worlds[i]); } } - return err; } =20 static void pci_rocker_uninit(PCIDevice *dev) @@ -1528,7 +1523,7 @@ static void rocker_class_init(ObjectClass *klass, voi= d *data) DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 - k->init =3D pci_rocker_init; + k->realize =3D pci_rocker_realize; k->exit =3D pci_rocker_uninit; k->vendor_id =3D PCI_VENDOR_ID_REDHAT; k->device_id =3D PCI_DEVICE_ID_REDHAT_ROCKER; --=20 2.9.3