Blame SOURCES/kvm-slirp-use-correct-size-while-emulating-commands.patch

73f313
From 95cf6abd88bedca0533ababfdb6480c3174f3b81 Mon Sep 17 00:00:00 2001
73f313
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
73f313
Date: Fri, 17 Jan 2020 12:00:37 +0100
73f313
Subject: [PATCH 3/3] slirp: use correct size while emulating commands
73f313
MIME-Version: 1.0
73f313
Content-Type: text/plain; charset=UTF-8
73f313
Content-Transfer-Encoding: 8bit
73f313
73f313
RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>
73f313
Message-id: <20200117120037.12800-4-philmd@redhat.com>
73f313
Patchwork-id: 93397
73f313
O-Subject: [RHEL-7.7.z qemu-kvm + RHEL-7.8 qemu-kvm + RHEL-7.9 qemu-kvm PATCH v2 3/3] slirp: use correct size while emulating commands
73f313
Bugzilla: 1791560
73f313
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
73f313
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
73f313
RH-Acked-by: Thomas Huth <thuth@redhat.com>
73f313
73f313
From: Prasad J Pandit <pjp@fedoraproject.org>
73f313
73f313
While emulating services in tcp_emu(), it uses 'mbuf' size
73f313
'm->m_size' to write commands via snprintf(3). Use M_FREEROOM(m)
73f313
size to avoid possible OOB access.
73f313
73f313
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
73f313
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
73f313
Message-Id: <20200109094228.79764-3-ppandit@redhat.com>
73f313
(cherry picked from libslirp commit 82ebe9c370a0e2970fb5695aa19aa5214a6a1c80)
73f313
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
73f313
73f313
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
73f313
---
73f313
 slirp/tcp_subr.c | 8 ++++----
73f313
 1 file changed, 4 insertions(+), 4 deletions(-)
73f313
73f313
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
73f313
index 321c2a4..19e2245 100644
73f313
--- a/slirp/tcp_subr.c
73f313
+++ b/slirp/tcp_subr.c
73f313
@@ -648,7 +648,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
73f313
 			n4 =  (laddr & 0xff);
73f313
 
73f313
 			m->m_len = bptr - m->m_data; /* Adjust length */
73f313
-                        m->m_len += snprintf(bptr, m->m_size - m->m_len,
73f313
+                        m->m_len += snprintf(bptr, M_FREEROOM(m),
73f313
                                              "ORT %d,%d,%d,%d,%d,%d\r\n%s",
73f313
                                              n1, n2, n3, n4, n5, n6, x==7?buff:"");
73f313
 			return 1;
73f313
@@ -681,7 +681,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
73f313
 			n4 =  (laddr & 0xff);
73f313
 
73f313
 			m->m_len = bptr - m->m_data; /* Adjust length */
73f313
-			m->m_len += snprintf(bptr, m->m_size - m->m_len,
73f313
+			m->m_len += snprintf(bptr, M_FREEROOM(m),
73f313
                                              "27 Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n%s",
73f313
                                              n1, n2, n3, n4, n5, n6, x==7?buff:"");
73f313
 
73f313
@@ -707,8 +707,8 @@ tcp_emu(struct socket *so, struct mbuf *m)
73f313
 		if (m->m_data[m->m_len-1] == '\0' && lport != 0 &&
73f313
 		    (so = tcp_listen(slirp, INADDR_ANY, 0, so->so_laddr.s_addr,
73f313
 		                     htons(lport), SS_FACCEPTONCE)) != NULL)
73f313
-                    m->m_len = snprintf(m->m_data, m->m_size, "%d",
73f313
-                                        ntohs(so->so_fport)) + 1;
73f313
+                    m->m_len = snprintf(m->m_data, M_ROOM(m),
73f313
+                                        "%d", ntohs(so->so_fport)) + 1;
73f313
 		return 1;
73f313
 
73f313
 	 case EMU_IRC:
73f313
-- 
73f313
1.8.3.1
73f313