|
 |
73f313 |
From 896665af83060fb673fc12081083f53a10a19dc5 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:36 +0100
|
|
|
73f313 |
Subject: [PATCH 2/3] slirp: use correct size while emulating IRC 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-3-philmd@redhat.com>
|
|
|
73f313 |
Patchwork-id: 93396
|
|
|
73f313 |
O-Subject: [RHEL-7.7.z qemu-kvm + RHEL-7.8 qemu-kvm + RHEL-7.9 qemu-kvm PATCH v2 2/3] slirp: use correct size while emulating IRC 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 IRC DCC commands, tcp_emu() uses 'mbuf' size
|
|
|
73f313 |
'm->m_size' to write DCC commands via snprintf(3). This may
|
|
|
73f313 |
lead to OOB write access, because 'bptr' points somewhere in
|
|
|
73f313 |
the middle of 'mbuf' buffer, not at the start. Use M_FREEROOM(m)
|
|
|
73f313 |
size to avoid OOB access.
|
|
|
73f313 |
|
|
|
73f313 |
Reported-by: Vishnu Dev TJ <vishnudevtj@gmail.com>
|
|
|
73f313 |
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
73f313 |
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
|
|
73f313 |
Message-Id: <20200109094228.79764-2-ppandit@redhat.com>
|
|
|
73f313 |
(cherry picked from libslirp commit ce131029d6d4a405cb7d3ac6716d03e58fb4a5d9)
|
|
|
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 | 6 +++---
|
|
|
73f313 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
73f313 |
|
|
|
73f313 |
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
|
|
|
73f313 |
index 70a4c83..321c2a4 100644
|
|
|
73f313 |
--- a/slirp/tcp_subr.c
|
|
|
73f313 |
+++ b/slirp/tcp_subr.c
|
|
|
73f313 |
@@ -728,7 +728,7 @@ 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->m_size,
|
|
|
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 |
@@ -739,7 +739,7 @@ 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->m_size,
|
|
|
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 |
@@ -750,7 +750,7 @@ 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->m_size,
|
|
|
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 |
--
|
|
|
73f313 |
1.8.3.1
|
|
|
73f313 |
|