From nobody Mon Apr 29 15:01:20 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528281499539230.08165068374137; Wed, 6 Jun 2018 03:38:19 -0700 (PDT) Received: from localhost ([::1]:51335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQVpX-0007Gg-KW for importer@patchew.org; Wed, 06 Jun 2018 06:38:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQVnL-000657-3a for qemu-devel@nongnu.org; Wed, 06 Jun 2018 06:36:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQVnJ-0001e5-V0 for qemu-devel@nongnu.org; Wed, 06 Jun 2018 06:35:59 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46592 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fQVnJ-0001dv-Qd for qemu-devel@nongnu.org; Wed, 06 Jun 2018 06:35:57 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 54523C12BA; Wed, 6 Jun 2018 10:35:57 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-133.brq.redhat.com [10.40.204.133]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF6702017D05; Wed, 6 Jun 2018 10:35:55 +0000 (UTC) From: P J P To: Qemu Developers Date: Wed, 6 Jun 2018 16:05:48 +0530 Message-Id: <20180606103549.12031-2-ppandit@redhat.com> In-Reply-To: <20180606103549.12031-1-ppandit@redhat.com> References: <20180606103549.12031-1-ppandit@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 06 Jun 2018 10:35:57 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 06 Jun 2018 10:35:57 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'ppandit@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v1 1/2] 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: Samuel Thibault , Prasad J Pandit , Jan Kiszka 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 --- slirp/mbuf.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) Update v1: fixed indentation https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg01121.html diff --git a/slirp/mbuf.c b/slirp/mbuf.c index 5ff24559fd..6650981fc7 100644 --- a/slirp/mbuf.c +++ b/slirp/mbuf.c @@ -137,8 +137,9 @@ 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); + if (M_FREEROOM(m) < n->m_len) { + 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; @@ -158,12 +159,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,7 +172,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 --=20 2.17.1 From nobody Mon Apr 29 15:01:20 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528281541514614.7284185664826; Wed, 6 Jun 2018 03:39:01 -0700 (PDT) Received: from localhost ([::1]:51338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQVqG-0007tf-PR for importer@patchew.org; Wed, 06 Jun 2018 06:39:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQVnQ-0006Aa-7p for qemu-devel@nongnu.org; Wed, 06 Jun 2018 06:36:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQVnM-0001fK-4S for qemu-devel@nongnu.org; Wed, 06 Jun 2018 06:36:04 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:41974 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fQVnL-0001fA-Vr for qemu-devel@nongnu.org; Wed, 06 Jun 2018 06:36:00 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7866740201DE; Wed, 6 Jun 2018 10:35:59 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-133.brq.redhat.com [10.40.204.133]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D2860200BCBB; Wed, 6 Jun 2018 10:35:57 +0000 (UTC) From: P J P To: Qemu Developers Date: Wed, 6 Jun 2018 16:05:49 +0530 Message-Id: <20180606103549.12031-3-ppandit@redhat.com> In-Reply-To: <20180606103549.12031-1-ppandit@redhat.com> References: <20180606103549.12031-1-ppandit@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 06 Jun 2018 10:35:59 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 06 Jun 2018 10:35:59 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'ppandit@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v1 2/2] slirp: reformat m_cat 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: Samuel Thibault , Prasad J Pandit , Jan Kiszka 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_cat routine and minor refactoring. Signed-off-by: Prasad J Pandit --- slirp/mbuf.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/slirp/mbuf.c b/slirp/mbuf.c index 6650981fc7..e012cd4760 100644 --- a/slirp/mbuf.c +++ b/slirp/mbuf.c @@ -152,32 +152,28 @@ 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 compiles 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; - } - - m->m_size =3D size + datasize; + 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_data =3D m->m_ext + datasize; + m->m_size =3D size + datasize; } =20 =20 - void m_adj(struct mbuf *m, int len) { --=20 2.17.1