cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-slirp-fix-big-little-endian-conversion-in-ident-prot.patch

d740ea
From 91ca04a8a1df19f73e50733190175e137eeba933 Mon Sep 17 00:00:00 2001
3f5fa1
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
d740ea
Date: Mon, 20 May 2019 16:43:13 +0200
3f5fa1
Subject: [PATCH 2/4] slirp: fix big/little endian conversion in ident protocol
3f5fa1
MIME-Version: 1.0
3f5fa1
Content-Type: text/plain; charset=UTF-8
3f5fa1
Content-Transfer-Encoding: 8bit
3f5fa1
3f5fa1
RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>
d740ea
Message-id: <20190520164315.22140-2-marcandre.lureau@redhat.com>
d740ea
Patchwork-id: 88093
d740ea
O-Subject: [RHEL-7.7 qemu-kvm PATCH 1/3] slirp: fix big/little endian conversion in ident protocol
d740ea
Bugzilla: 1669068
3f5fa1
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
3f5fa1
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
3f5fa1
RH-Acked-by: Thomas Huth <thuth@redhat.com>
3f5fa1
3f5fa1
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
3f5fa1
3f5fa1
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
3f5fa1
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
3f5fa1
d740ea
[ MA - backported to ease backport of
d740ea
  https://bugzilla.redhat.com/show_bug.cgi?id=1669068 ]
3f5fa1
d740ea
(cherry picked from 1fd71067dae501f1c78618e9583c6cc72db0cfa6)
3f5fa1
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
d740ea
3f5fa1
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
3f5fa1
---
3f5fa1
 slirp/tcp_subr.c | 4 +++-
3f5fa1
 1 file changed, 3 insertions(+), 1 deletion(-)
3f5fa1
3f5fa1
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
3f5fa1
index 0b7138b..80538a9 100644
3f5fa1
--- a/slirp/tcp_subr.c
3f5fa1
+++ b/slirp/tcp_subr.c
3f5fa1
@@ -601,10 +601,12 @@ tcp_emu(struct socket *so, struct mbuf *m)
3f5fa1
 						    tmpso->so_fport == n1) {
3f5fa1
 							if (getsockname(tmpso->s,
3f5fa1
 								(struct sockaddr *)&addr, &addrlen) == 0)
3f5fa1
-							   n2 = ntohs(addr.sin_port);
3f5fa1
+							   n2 = addr.sin_port;
3f5fa1
 							break;
3f5fa1
 						}
3f5fa1
 					}
3f5fa1
+					NTOHS(n1);
3f5fa1
+					NTOHS(n2);
3f5fa1
 					so_rcv->sb_cc = snprintf(so_rcv->sb_data,
3f5fa1
 								 so_rcv->sb_datalen,
3f5fa1
 								 "%d,%d\r\n", n1, n2);
3f5fa1
-- 
3f5fa1
1.8.3.1
3f5fa1