From nobody Sun Apr 28 18:55:02 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.zohomail.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 1528438684188161.9786521025046; Thu, 7 Jun 2018 23:18:04 -0700 (PDT) Received: from localhost ([::1]:33369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRAil-0003GR-72 for importer@patchew.org; Fri, 08 Jun 2018 02:17:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45109) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRAeL-0007dM-SN for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRAeJ-0004J1-Pu for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:25 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:53422) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fRAeJ-0004Ia-JO for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:23 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id A7352B51; Fri, 8 Jun 2018 08:13:22 +0200 (CEST) Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dY-P60sP28el; Fri, 8 Jun 2018 08:13:21 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2001:648:2000:25:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 14B1AD3F; Fri, 8 Jun 2018 08:13:18 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.91) (envelope-from ) id 1fRAeC-0001I0-Ut; Fri, 08 Jun 2018 08:13:16 +0200 X-Virus-Scanned: Debian amavisd-new at aquilenet.fr From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Fri, 8 Jun 2018 09:13:12 +0300 Message-Id: <20180608061316.4909-2-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608061316.4909-1-samuel.thibault@ens-lyon.org> References: <20180608061316.4909-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.233.100.1 Subject: [Qemu-devel] [PULL 1/5] slirp: Fix spurious error report when sending directly 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: Samuel Thibault , stefanha@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move check to where it actually is useful, and reduce scope of 'len' variable along the way. Signed-off-by: Samuel Thibault Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- slirp/socket.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/slirp/socket.c b/slirp/socket.c index e2a71c9b04..08fe98907d 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -340,7 +340,7 @@ sosendoob(struct socket *so) struct sbuf *sb =3D &so->so_rcv; char buff[2048]; /* XXX Shouldn't be sending more oob data than this */ =20 - int n, len; + int n; =20 DEBUG_CALL("sosendoob"); DEBUG_ARG("so =3D %p", so); @@ -359,7 +359,7 @@ sosendoob(struct socket *so) * send it all */ uint32_t urgc =3D so->so_urgc; - len =3D (sb->sb_data + sb->sb_datalen) - sb->sb_rptr; + int len =3D (sb->sb_data + sb->sb_datalen) - sb->sb_rptr; if (len > urgc) { len =3D urgc; } @@ -374,13 +374,13 @@ sosendoob(struct socket *so) len +=3D n; } n =3D slirp_send(so, buff, len, (MSG_OOB)); /* |MSG_DONTWAIT)); */ - } - #ifdef DEBUG - if (n !=3D len) { - DEBUG_ERROR((dfd, "Didn't send all data urgently XXXXX\n")); - } + if (n !=3D len) { + DEBUG_ERROR((dfd, "Didn't send all data urgently XXXXX\n")); + } #endif + } + if (n < 0) { return n; } --=20 2.17.1 From nobody Sun Apr 28 18:55:02 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 152843853195228.306287303527483; Thu, 7 Jun 2018 23:15:31 -0700 (PDT) Received: from localhost ([::1]:33350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRAgH-00010C-SI for importer@patchew.org; Fri, 08 Jun 2018 02:15:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRAeJ-0007d7-Jd for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRAeI-0004IV-MM for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:23 -0400 Received: from hera.aquilenet.fr ([2a0c:e300::1]:48614) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fRAeI-0004Hp-FN for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:22 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 31AD9D41; Fri, 8 Jun 2018 08:13:20 +0200 (CEST) Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HEqRW76XRT5J; Fri, 8 Jun 2018 08:13:19 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2001:648:2000:25:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id D9042BF1; Fri, 8 Jun 2018 08:13:18 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.91) (envelope-from ) id 1fRAeC-0001I2-VX; Fri, 08 Jun 2018 08:13:16 +0200 X-Virus-Scanned: Debian amavisd-new at aquilenet.fr From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Fri, 8 Jun 2018 09:13:13 +0300 Message-Id: <20180608061316.4909-3-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608061316.4909-1-samuel.thibault@ens-lyon.org> References: <20180608061316.4909-1-samuel.thibault@ens-lyon.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a0c:e300::1 Subject: [Qemu-devel] [PULL 2/5] slirp: Add Samuel Thibault's staging tree for slirp 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: Samuel Thibault , stefanha@redhat.com, jan.kiszka@siemens.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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Samuel Thibault Acked-by: Thomas Huth --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 41cd3736a9..4c73c16fee 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1675,6 +1675,7 @@ S: Maintained F: slirp/ F: net/slirp.c F: include/net/slirp.h +T: git https://people.debian.org/~sthibault/qemu.git slirp T: git git://git.kiszka.org/qemu.git queues/slirp =20 Stubs --=20 2.17.1 From nobody Sun Apr 28 18:55:02 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528438531988207.29365575275983; Thu, 7 Jun 2018 23:15:31 -0700 (PDT) Received: from localhost ([::1]:33353 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRAgL-0001ED-H4 for importer@patchew.org; Fri, 08 Jun 2018 02:15:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRAeL-0007dP-Sy for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRAeI-0004IP-Kp for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:25 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:53392) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fRAeI-0004Hu-Ei for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:22 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id E50B1BF1; Fri, 8 Jun 2018 08:13:20 +0200 (CEST) Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W_W6htCR3OCc; Fri, 8 Jun 2018 08:13:20 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2001:648:2000:25:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id E99E8C43; Fri, 8 Jun 2018 08:13:18 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.91) (envelope-from ) id 1fRAeC-0001I4-WE; Fri, 08 Jun 2018 08:13:17 +0200 X-Virus-Scanned: Debian amavisd-new at aquilenet.fr From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Fri, 8 Jun 2018 09:13:14 +0300 Message-Id: <20180608061316.4909-4-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608061316.4909-1-samuel.thibault@ens-lyon.org> References: <20180608061316.4909-1-samuel.thibault@ens-lyon.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.233.100.1 Subject: [Qemu-devel] [PULL 3/5] slirp: fix domainname version availability 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: Samuel Thibault , stefanha@redhat.com, jan.kiszka@siemens.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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The change missed the 2.12 deadline. Signed-off-by: Samuel Thibault Reviewed-by: Eric Blake --- qapi/net.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/net.json b/qapi/net.json index 32681a1af7..6b7d93cb59 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -161,7 +161,7 @@ # to the guest # # @domainname: guest-visible domain name of the virtual nameserver -# (since 2.12) +# (since 3.0) # # @ipv6-prefix: IPv6 network prefix (default is fec0::) (since # 2.6). The network prefix is given in the usual --=20 2.17.1 From nobody Sun Apr 28 18:55:02 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.zohomail.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 1528438683369456.53408217998026; Thu, 7 Jun 2018 23:18:03 -0700 (PDT) Received: from localhost ([::1]:33368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRAik-0003Fo-NA for importer@patchew.org; Fri, 08 Jun 2018 02:17:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRAeM-0007dn-Eo for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRAeL-0004Jj-Ep for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:26 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:53446) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fRAeL-0004JT-8W for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:25 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 566B1C43; Fri, 8 Jun 2018 08:13:24 +0200 (CEST) Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WhmxEaS2QJeJ; Fri, 8 Jun 2018 08:13:21 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2001:648:2000:25:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 041CFC61; Fri, 8 Jun 2018 08:13:18 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.91) (envelope-from ) id 1fRAeD-0001I6-0m; Fri, 08 Jun 2018 08:13:17 +0200 X-Virus-Scanned: Debian amavisd-new at aquilenet.fr From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Fri, 8 Jun 2018 09:13:15 +0300 Message-Id: <20180608061316.4909-5-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608061316.4909-1-samuel.thibault@ens-lyon.org> References: <20180608061316.4909-1-samuel.thibault@ens-lyon.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.233.100.1 Subject: [Qemu-devel] [PULL 4/5] slirp: correct size computation while concatenating mbuf 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: jan.kiszka@siemens.com, Prasad J Pandit , stefanha@redhat.com, Samuel Thibault 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit While reassembling incoming fragmented datagrams, 'm_cat' routine extends the 'mbuf' buffer, if it has insufficient room. It computes a wrong buffer size, which leads to overwriting adjacent heap buffer area. Correct this size computation in m_cat. Reported-by: ZDI Disclosures Signed-off-by: Prasad J Pandit Signed-off-by: Samuel Thibault --- slirp/mbuf.c | 11 +++++------ slirp/mbuf.h | 8 +++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/slirp/mbuf.c b/slirp/mbuf.c index 5ff24559fd..18cbf759a7 100644 --- a/slirp/mbuf.c +++ b/slirp/mbuf.c @@ -138,7 +138,7 @@ m_cat(struct mbuf *m, struct mbuf *n) * If there's no room, realloc */ if (M_FREEROOM(m) < n->m_len) - m_inc(m,m->m_size+MINCSIZE); + m_inc(m, m->m_len + n->m_len); =20 memcpy(m->m_data+m->m_len, n->m_data, n->m_len); m->m_len +=3D n->m_len; @@ -147,7 +147,7 @@ m_cat(struct mbuf *m, struct mbuf *n) } =20 =20 -/* make m size bytes large */ +/* make m 'size' bytes large from m_data */ void m_inc(struct mbuf *m, int size) { @@ -158,12 +158,12 @@ m_inc(struct mbuf *m, int size) =20 if (m->m_flags & M_EXT) { datasize =3D m->m_data - m->m_ext; - m->m_ext =3D g_realloc(m->m_ext, size); + m->m_ext =3D g_realloc(m->m_ext, size + datasize); m->m_data =3D m->m_ext + datasize; } else { char *dat; datasize =3D m->m_data - m->m_dat; - dat =3D g_malloc(size); + dat =3D g_malloc(size + datasize); memcpy(dat, m->m_dat, m->m_size); =20 m->m_ext =3D dat; @@ -171,8 +171,7 @@ m_inc(struct mbuf *m, int size) m->m_flags |=3D M_EXT; } =20 - m->m_size =3D size; - + m->m_size =3D size + datasize; } =20 =20 diff --git a/slirp/mbuf.h b/slirp/mbuf.h index 893601ff9d..33b84485d6 100644 --- a/slirp/mbuf.h +++ b/slirp/mbuf.h @@ -33,8 +33,6 @@ #ifndef MBUF_H #define MBUF_H =20 -#define MINCSIZE 4096 /* Amount to increase mbuf if too small */ - /* * Macros for type conversion * mtod(m,t) - convert mbuf pointer to data pointer of correct type @@ -72,11 +70,11 @@ struct mbuf { struct mbuf *m_prevpkt; /* Flags aren't used in the output queue */ int m_flags; /* Misc flags */ =20 - int m_size; /* Size of data */ + int m_size; /* Size of mbuf, from m_dat or m_ext */ struct socket *m_so; =20 - caddr_t m_data; /* Location of data */ - int m_len; /* Amount of data in this mbuf */ + caddr_t m_data; /* Current location of data */ + int m_len; /* Amount of data in this mbuf, from m_data */ =20 Slirp *slirp; bool resolution_requested; --=20 2.17.1 From nobody Sun Apr 28 18:55:02 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.zohomail.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 152843853111933.87983638269952; Thu, 7 Jun 2018 23:15:31 -0700 (PDT) Received: from localhost ([::1]:33352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRAgM-0001D8-6P for importer@patchew.org; Fri, 08 Jun 2018 02:15:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRAeL-0007dN-ST for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRAeJ-0004Ie-1K for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:25 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:53408) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fRAeI-0004IH-Rd for qemu-devel@nongnu.org; Fri, 08 Jun 2018 02:13:22 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id CBE0AD48; Fri, 8 Jun 2018 08:13:21 +0200 (CEST) Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xlsFpMuAlzW7; Fri, 8 Jun 2018 08:13:19 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2001:648:2000:25:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id CB392B51; Fri, 8 Jun 2018 08:13:18 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.91) (envelope-from ) id 1fRAeD-0001I8-1X; Fri, 08 Jun 2018 08:13:17 +0200 X-Virus-Scanned: Debian amavisd-new at aquilenet.fr From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Fri, 8 Jun 2018 09:13:16 +0300 Message-Id: <20180608061316.4909-6-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608061316.4909-1-samuel.thibault@ens-lyon.org> References: <20180608061316.4909-1-samuel.thibault@ens-lyon.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.233.100.1 Subject: [Qemu-devel] [PULL 5/5] slirp: reformat m_inc routine 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: jan.kiszka@siemens.com, Prasad J Pandit , stefanha@redhat.com, Samuel Thibault 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit Coding style changes to the m_inc routine and minor refactoring. Reported-by: ZDI Disclosures Signed-off-by: Prasad J Pandit Signed-off-by: Samuel Thibault --- slirp/mbuf.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/slirp/mbuf.c b/slirp/mbuf.c index 18cbf759a7..0c189e1a7b 100644 --- a/slirp/mbuf.c +++ b/slirp/mbuf.c @@ -151,27 +151,25 @@ m_cat(struct mbuf *m, struct mbuf *n) void m_inc(struct mbuf *m, int size) { - int datasize; + int datasize; =20 - /* some compiles throw up on gotos. This one we can fake. */ - if(m->m_size>size) return; + /* some compilers throw up on gotos. This one we can fake. */ + if (m->m_size > size) { + return; + } =20 - if (m->m_flags & M_EXT) { - datasize =3D m->m_data - m->m_ext; - m->m_ext =3D g_realloc(m->m_ext, size + datasize); - m->m_data =3D m->m_ext + datasize; - } else { - char *dat; - datasize =3D m->m_data - m->m_dat; - dat =3D g_malloc(size + datasize); - memcpy(dat, m->m_dat, m->m_size); - - m->m_ext =3D dat; - m->m_data =3D m->m_ext + datasize; - m->m_flags |=3D M_EXT; - } + if (m->m_flags & M_EXT) { + datasize =3D m->m_data - m->m_ext; + m->m_ext =3D g_realloc(m->m_ext, size + datasize); + } else { + datasize =3D m->m_data - m->m_dat; + m->m_ext =3D g_malloc(size + datasize); + memcpy(m->m_ext, m->m_dat, m->m_size); + m->m_flags |=3D M_EXT; + } =20 - m->m_size =3D size + datasize; + m->m_data =3D m->m_ext + datasize; + m->m_size =3D size + datasize; } =20 =20 --=20 2.17.1