yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-slirp-ensure-there-is-enough-space-in-mbuf-to-null-t.patch

b38b0f
From ad30988fde29143951447e7f973918eaa09c448c Mon Sep 17 00:00:00 2001
69f3e1
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
b38b0f
Date: Wed, 24 Jul 2019 15:53:36 +0100
b38b0f
Subject: [PATCH 11/14] slirp: ensure there is enough space in mbuf to
69f3e1
 null-terminate
69f3e1
MIME-Version: 1.0
69f3e1
Content-Type: text/plain; charset=UTF-8
69f3e1
Content-Transfer-Encoding: 8bit
69f3e1
69f3e1
RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>
b38b0f
Message-id: <20190724155337.25303-4-philmd@redhat.com>
b38b0f
Patchwork-id: 89678
b38b0f
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 3/4] slirp: ensure there is enough space in mbuf to null-terminate
b38b0f
Bugzilla: 1727642
69f3e1
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
69f3e1
RH-Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
b38b0f
RH-Acked-by: Thomas Huth <thuth@redhat.com>
69f3e1
69f3e1
From: Marc-André Lureau <marcandre.lureau@redhat.com>
69f3e1
69f3e1
Prevents from buffer overflows.
69f3e1
Related to: https://bugzilla.redhat.com/show_bug.cgi?id=1664205
69f3e1
69f3e1
Cc: Prasad J Pandit <pjp@fedoraproject.org>
69f3e1
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
69f3e1
69f3e1
(cherry picked from libslirp commit
69f3e1
306fef58b54d793ba4b259728c21322765bda917)
b38b0f
69f3e1
[ MA - backported with style conflicts fixes ]
69f3e1
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
b38b0f
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
b38b0f
(cherry picked from commit e80c12dfdbde349dcd225771a4801b47be0b3b5f)
69f3e1
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
69f3e1
69f3e1
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
69f3e1
---
69f3e1
 slirp/tcp_subr.c | 3 +++
69f3e1
 1 file changed, 3 insertions(+)
69f3e1
69f3e1
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
69f3e1
index 393447d..e245e0d 100644
69f3e1
--- a/slirp/tcp_subr.c
69f3e1
+++ b/slirp/tcp_subr.c
69f3e1
@@ -646,6 +646,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
69f3e1
 			memcpy(so_rcv->sb_wptr, m->m_data, m->m_len);
69f3e1
 			so_rcv->sb_wptr += m->m_len;
69f3e1
 			so_rcv->sb_rptr += m->m_len;
69f3e1
+			m_inc(m, m->m_len + 1);
69f3e1
 			m->m_data[m->m_len] = 0; /* NULL terminate */
69f3e1
 			if (strchr(m->m_data, '\r') || strchr(m->m_data, '\n')) {
69f3e1
 				if (sscanf(so_rcv->sb_data, "%u%*[ ,]%u", &n1, &n2) == 2) {
69f3e1
@@ -679,6 +680,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
69f3e1
 		}
69f3e1
 
69f3e1
         case EMU_FTP: /* ftp */
69f3e1
+		m_inc(m, m->m_len + 1);
69f3e1
                 *(m->m_data+m->m_len) = 0; /* NUL terminate for strstr */
69f3e1
 		if ((bptr = (char *)strstr(m->m_data, "ORT")) != NULL) {
69f3e1
 			/*
69f3e1
@@ -776,6 +778,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
69f3e1
 		/*
69f3e1
 		 * Need to emulate DCC CHAT, DCC SEND and DCC MOVE
69f3e1
 		 */
69f3e1
+		m_inc(m, m->m_len + 1);
69f3e1
 		*(m->m_data+m->m_len) = 0; /* NULL terminate the string for strstr */
69f3e1
 		if ((bptr = (char *)strstr(m->m_data, "DCC")) == NULL)
69f3e1
 			 return 1;
69f3e1
-- 
69f3e1
1.8.3.1
69f3e1