|
 |
73f313 |
From 7617de175ec7d3004aa276ffca3f41d721bc4ae5 Mon Sep 17 00:00:00 2001
|
|
|
73f313 |
From: jmaloy <jmaloy@redhat.com>
|
|
|
73f313 |
Date: Thu, 13 Feb 2020 21:08:18 +0100
|
|
|
73f313 |
Subject: [PATCH 2/6] tcp_emu: fix unsafe snprintf() usages
|
|
|
73f313 |
MIME-Version: 1.0
|
|
|
73f313 |
Content-Type: text/plain; charset=UTF-8
|
|
|
73f313 |
Content-Transfer-Encoding: 8bit
|
|
|
73f313 |
|
|
|
73f313 |
Message-id: <20200213210818.9090-3-jmaloy@redhat.com>
|
|
|
73f313 |
Patchwork-id: 93832
|
|
|
73f313 |
O-Subject: [RHEL-7.8 qemu-kvm PATCH 2/2] tcp_emu: fix unsafe snprintf() usages
|
|
|
73f313 |
Bugzilla: 1800515
|
|
|
73f313 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
73f313 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
73f313 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
73f313 |
|
|
|
73f313 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
73f313 |
|
|
|
73f313 |
Various calls to snprintf() assume that snprintf() returns "only" the
|
|
|
73f313 |
number of bytes written (excluding terminating NUL).
|
|
|
73f313 |
|
|
|
73f313 |
https://pubs.opengroup.org/onlinepubs/9699919799/functions/snprintf.html#tag_16_159_04
|
|
|
73f313 |
|
|
|
73f313 |
"Upon successful completion, the snprintf() function shall return the
|
|
|
73f313 |
number of bytes that would be written to s had n been sufficiently
|
|
|
73f313 |
large excluding the terminating null byte."
|
|
|
73f313 |
|
|
|
73f313 |
Before patch ce131029, if there isn't enough room in "m_data" for the
|
|
|
73f313 |
"DCC ..." message, we overflow "m_data".
|
|
|
73f313 |
|
|
|
73f313 |
After the patch, if there isn't enough room for the same, we don't
|
|
|
73f313 |
overflow "m_data", but we set "m_len" out-of-bounds. The next time an
|
|
|
73f313 |
access is bounded by "m_len", we'll have a buffer overflow then.
|
|
|
73f313 |
|
|
|
73f313 |
Use slirp_fmt*() to fix potential OOB memory access.
|
|
|
73f313 |
|
|
|
73f313 |
Reported-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
73f313 |
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
73f313 |
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
|
|
73f313 |
Message-Id: <20200127092414.169796-7-marcandre.lureau@redhat.com>
|
|
|
73f313 |
(cherry picked from commit 68ccb8021a838066f0951d4b2817eb6b6f10a843)
|
|
|
73f313 |
|
|
|
73f313 |
Manually re-adapted since the cherry-pick didn't apply cleanly.
|
|
|
73f313 |
|
|
|
73f313 |
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
|
73f313 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
73f313 |
---
|
|
|
73f313 |
slirp/tcp_subr.c | 44 +++++++++++++++++++++-----------------------
|
|
|
73f313 |
1 file changed, 21 insertions(+), 23 deletions(-)
|
|
|
73f313 |
|
|
|
73f313 |
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
|
|
|
73f313 |
index e83575e..8dae0cc 100644
|
|
|
73f313 |
--- a/slirp/tcp_subr.c
|
|
|
73f313 |
+++ b/slirp/tcp_subr.c
|
|
|
73f313 |
@@ -610,8 +610,7 @@ tcp_emu(struct socket *so, struct mbuf *m)
|
|
|
73f313 |
NTOHS(n1);
|
|
|
73f313 |
NTOHS(n2);
|
|
|
73f313 |
m_inc(m, snprintf(NULL, 0, "%d,%d\r\n", n1, n2) + 1);
|
|
|
73f313 |
- m->m_len = snprintf(m->m_data, M_ROOM(m), "%d,%d\r\n", n1, n2);
|
|
|
73f313 |
- assert(m->m_len < M_ROOM(m));
|
|
|
73f313 |
+ m->m_len = slirp_fmt(m->m_data, M_ROOM(m), "%d,%d\r\n", n1, n2);
|
|
|
73f313 |
} else {
|
|
|
73f313 |
*eol = '\r';
|
|
|
73f313 |
}
|
|
|
73f313 |
@@ -651,9 +650,9 @@ 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_FREEROOM(m),
|
|
|
73f313 |
- "ORT %d,%d,%d,%d,%d,%d\r\n%s",
|
|
|
73f313 |
- n1, n2, n3, n4, n5, n6, x==7?buff:"");
|
|
|
73f313 |
+ m->m_len += slirp_fmt(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 |
} else if ((bptr = (char *)strstr(m->m_data, "27 Entering")) != NULL) {
|
|
|
73f313 |
/*
|
|
|
73f313 |
@@ -684,10 +683,9 @@ 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_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 |
+ m->m_len += slirp_fmt(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 |
return 1;
|
|
|
73f313 |
}
|
|
|
73f313 |
|
|
|
73f313 |
@@ -710,8 +708,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_ROOM(m),
|
|
|
73f313 |
- "%d", ntohs(so->so_fport)) + 1;
|
|
|
73f313 |
+ m->m_len = slirp_fmt0(m->m_data, M_ROOM(m),
|
|
|
73f313 |
+ "%d", ntohs(so->so_fport));
|
|
|
73f313 |
return 1;
|
|
|
73f313 |
|
|
|
73f313 |
case EMU_IRC:
|
|
|
73f313 |
@@ -731,10 +729,10 @@ tcp_emu(struct socket *so, struct mbuf *m)
|
|
|
73f313 |
return 1;
|
|
|
73f313 |
}
|
|
|
73f313 |
m->m_len = bptr - m->m_data; /* Adjust length */
|
|
|
73f313 |
- m->m_len += snprintf(bptr, M_FREEROOM(m),
|
|
|
73f313 |
- "DCC CHAT chat %lu %u%c\n",
|
|
|
73f313 |
- (unsigned long)ntohl(so->so_faddr.s_addr),
|
|
|
73f313 |
- ntohs(so->so_fport), 1);
|
|
|
73f313 |
+ m->m_len += slirp_fmt(bptr, M_FREEROOM(m),
|
|
|
73f313 |
+ "DCC CHAT chat %lu %u%c\n",
|
|
|
73f313 |
+ (unsigned long)ntohl(so->so_faddr.s_addr),
|
|
|
73f313 |
+ ntohs(so->so_fport), 1);
|
|
|
73f313 |
} else if (sscanf(bptr, "DCC SEND %256s %u %u %u", buff, &laddr, &lport, &n1) == 4) {
|
|
|
73f313 |
if ((so = tcp_listen(slirp, INADDR_ANY, 0,
|
|
|
73f313 |
htonl(laddr), htons(lport),
|
|
|
73f313 |
@@ -742,10 +740,10 @@ tcp_emu(struct socket *so, struct mbuf *m)
|
|
|
73f313 |
return 1;
|
|
|
73f313 |
}
|
|
|
73f313 |
m->m_len = bptr - m->m_data; /* Adjust length */
|
|
|
73f313 |
- m->m_len += snprintf(bptr, M_FREEROOM(m),
|
|
|
73f313 |
- "DCC SEND %s %lu %u %u%c\n", buff,
|
|
|
73f313 |
- (unsigned long)ntohl(so->so_faddr.s_addr),
|
|
|
73f313 |
- ntohs(so->so_fport), n1, 1);
|
|
|
73f313 |
+ m->m_len += slirp_fmt(bptr, M_FREEROOM(m),
|
|
|
73f313 |
+ "DCC SEND %s %lu %u %u%c\n", buff,
|
|
|
73f313 |
+ (unsigned long)ntohl(so->so_faddr.s_addr),
|
|
|
73f313 |
+ ntohs(so->so_fport), n1, 1);
|
|
|
73f313 |
} else if (sscanf(bptr, "DCC MOVE %256s %u %u %u", buff, &laddr, &lport, &n1) == 4) {
|
|
|
73f313 |
if ((so = tcp_listen(slirp, INADDR_ANY, 0,
|
|
|
73f313 |
htonl(laddr), htons(lport),
|
|
|
73f313 |
@@ -753,10 +751,10 @@ tcp_emu(struct socket *so, struct mbuf *m)
|
|
|
73f313 |
return 1;
|
|
|
73f313 |
}
|
|
|
73f313 |
m->m_len = bptr - m->m_data; /* Adjust length */
|
|
|
73f313 |
- m->m_len += snprintf(bptr, M_FREEROOM(m),
|
|
|
73f313 |
- "DCC MOVE %s %lu %u %u%c\n", buff,
|
|
|
73f313 |
- (unsigned long)ntohl(so->so_faddr.s_addr),
|
|
|
73f313 |
- ntohs(so->so_fport), n1, 1);
|
|
|
73f313 |
+ m->m_len += slirp_fmt(bptr, M_FREEROOM(m),
|
|
|
73f313 |
+ "DCC MOVE %s %lu %u %u%c\n", buff,
|
|
|
73f313 |
+ (unsigned long)ntohl(so->so_faddr.s_addr),
|
|
|
73f313 |
+ ntohs(so->so_fport), n1, 1);
|
|
|
73f313 |
}
|
|
|
73f313 |
return 1;
|
|
|
73f313 |
|
|
|
73f313 |
--
|
|
|
73f313 |
1.8.3.1
|
|
|
73f313 |
|