summary refs log tree commit diff stats
path: root/slirp/tcp_subr.c
diff options
context:
space:
mode:
authorPrasad J Pandit <pjp@fedoraproject.org>2019-01-13 23:29:48 +0530
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2019-01-14 23:36:38 +0100
commita7104eda7dab99d0cdbd3595c211864cba415905 (patch)
tree7e0b56c8ce1fa1b553560b0f6918e9db824a2dfc /slirp/tcp_subr.c
parent55ef9c617b4297d324cabfb68e6cea772349f5b4 (diff)
downloadfocaccia-qemu-a7104eda7dab99d0cdbd3595c211864cba415905.tar.gz
focaccia-qemu-a7104eda7dab99d0cdbd3595c211864cba415905.zip
slirp: check data length while emulating ident function
While emulating identification protocol, tcp_emu() does not check
available space in the 'sc_rcv->sb_data' buffer. It could lead to
heap buffer overflow issue. Add check to avoid it.

Reported-by: Kira <864786842@qq.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'slirp/tcp_subr.c')
-rw-r--r--slirp/tcp_subr.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index 4a9a5b5edc..23a841f26e 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -634,6 +634,11 @@ tcp_emu(struct socket *so, struct mbuf *m)
 			socklen_t addrlen = sizeof(struct sockaddr_in);
 			struct sbuf *so_rcv = &so->so_rcv;
 
+			if (m->m_len > so_rcv->sb_datalen
+					- (so_rcv->sb_wptr - so_rcv->sb_data)) {
+			    return 1;
+			}
+
 			memcpy(so_rcv->sb_wptr, m->m_data, m->m_len);
 			so_rcv->sb_wptr += m->m_len;
 			so_rcv->sb_rptr += m->m_len;