From nobody Tue Feb 10 14:32:32 2026 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 1495921691233287.60485179223735; Sat, 27 May 2017 14:48:11 -0700 (PDT) Received: from localhost ([::1]:42069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEjZB-0006Va-QP for importer@patchew.org; Sat, 27 May 2017 17:48:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEjXV-0005RU-FB for qemu-devel@nongnu.org; Sat, 27 May 2017 17:46:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEjXS-0003GX-JJ for qemu-devel@nongnu.org; Sat, 27 May 2017 17:46:25 -0400 Received: from hera.aquilenet.fr ([141.255.128.1]:43425) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEjXS-0003En-Cl for qemu-devel@nongnu.org; Sat, 27 May 2017 17:46:22 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id C0D1FC677; Sat, 27 May 2017 23:46: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 IPqdSztMXI0A; Sat, 27 May 2017 23:46:20 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2a01:cb19:181:c200:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id B1F4DC679; Sat, 27 May 2017 23:46:19 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.89) (envelope-from ) id 1dEjXP-0008V2-1z; Sat, 27 May 2017 23:46:19 +0200 X-Virus-Scanned: Debian amavisd-new at aquilenet.fr From: Samuel Thibault To: qemu-devel@nongnu.org Date: Sat, 27 May 2017 23:46:18 +0200 Message-Id: <20170527214618.32626-4-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170527214618.32626-1-samuel.thibault@ens-lyon.org> References: <20170527214618.32626-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: 141.255.128.1 Subject: [Qemu-devel] [PULL 3/3] Fix total IP header length in forwarded TCP packets 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, stefanha@redhat.com, Sjors Gielen , 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: Sjors Gielen When forwarding TCP packets, the internal tcpiphdr struct length was wrongly used inside the IP header. This commit changes the behaviour to what is used by tcp_output.c, using the correct full IP header + payload length. Signed-off-by: Sjors Gielen Signed-off-by: Samuel Thibault --- slirp/tcp_subr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index ed16e1807f..dc8b4bbb50 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c @@ -204,7 +204,7 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, stru= ct mbuf *m, m->m_len -=3D sizeof(struct tcpiphdr) - sizeof(struct tcphdr) - sizeof(struct ip); ip =3D mtod(m, struct ip *); - ip->ip_len =3D tlen; + ip->ip_len =3D m->m_len; ip->ip_dst =3D tcpiph_save.ti_dst; ip->ip_src =3D tcpiph_save.ti_src; ip->ip_p =3D tcpiph_save.ti_pr; @@ -224,7 +224,7 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, stru= ct mbuf *m, m->m_len -=3D sizeof(struct tcpiphdr) - sizeof(struct tcphdr) - sizeof(struct ip6); ip6 =3D mtod(m, struct ip6 *); - ip6->ip_pl =3D tlen; + ip6->ip_pl =3D tcpiph_save.ti_len; ip6->ip_dst =3D tcpiph_save.ti_dst6; ip6->ip_src =3D tcpiph_save.ti_src6; ip6->ip_nh =3D tcpiph_save.ti_nh6; --=20 2.11.0