From f4157e1c90e8986d95a57bf00cc8c0e297869c35 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>

Date: Wed, 24 Jul 2019 15:53:35 +0100

Subject: [PATCH 10/14] slirp: fix big/little endian conversion in ident

 protocol

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>

Message-id: <20190724155337.25303-3-philmd@redhat.com>

Patchwork-id: 89674

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 2/4] slirp: fix big/little endian conversion in ident protocol

Bugzilla: 1727642

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

From: Samuel Thibault <samuel.thibault@ens-lyon.org>

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

(cherry picked from commit 1fd71067dae501f1c78618e9583c6cc72db0cfa6)

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 slirp/tcp_subr.c | 4 +++-

 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c

index af1b3eb..393447d 100644

--- a/slirp/tcp_subr.c

+++ b/slirp/tcp_subr.c

@@ -661,10 +661,12 @@ tcp_emu(struct socket *so, struct mbuf *m)

 						    tmpso->so_fport == n1) {

 							if (getsockname(tmpso->s,

 								(struct sockaddr *)&addr, &addrlen) == 0)

-							   n2 = ntohs(addr.sin_port);

+							   n2 = addr.sin_port;

 							break;

 						}

 					}

+					NTOHS(n1);

+					NTOHS(n2);

 					so_rcv->sb_cc = snprintf(so_rcv->sb_data,

 								 so_rcv->sb_datalen,

 								 "%d,%d\r\n", n1, n2);

-- 

1.8.3.1