[v2] slirp: check data length while emulating ident function

Commit Message

Prasad Pandit Jan. 13, 2019, 5:59 p.m. UTC

From: Prasad J Pandit <[e-mail]>

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 <[e-mail]>
Signed-off-by: Prasad J Pandit <[e-mail]>
---
 slirp/tcp_subr.c | 4 ++++
 1 file changed, 4 insertions(+)

Update v2: return 1 instead of 0
  -> https://lists.gnu.org/archive/html/qemu-devel/2019-01/msg02182.html

Comments

Samuel Thibault Jan. 13, 2019, 11:29 p.m. UTC | #1

P J P, le dim. 13 janv. 2019 23:29:48 +0530, a ecrit:
> From: Prasad J Pandit <[e-mail]>
> 
> 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 <[e-mail]>
> Signed-off-by: Prasad J Pandit <[e-mail]>

Applied to my tree, thanks!

Samuel

Patch

diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index fa61349cbb..8b1bd8c8c0 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -635,6 +635,10 @@  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;