Skip to contentSkip to conversation

slirp: check data length while emulating ident function

PATCH Superseded P J P 2 participants 5 messages Jan 11, 2019 – Jan 13, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

P J P

author
#0 lore raw

PATCH 1/1 slirp: check data length while emulating ident function

From: Prasad J Pandit <[email protected]>

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.

---
 slirp/tcp_subr.c | 5 +++++
 1 file changed, 5 insertions(+)
slirp/tcp_subr.c +5 -0
index fa61349cbb..4415801fbb 100644
@@ -635,6 +635,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)) {
+                m_free(m);
+                return 0;
+            }
 			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;
Signature · 1 line
2.20.1
#1 lore raw

Hi

Quoted 18 lines · P J P

From: Prasad J Pandit <[email protected]>

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.

---
 slirp/tcp_subr.c | 5 +++++
 1 file changed, 5 insertions(+)
slirp/tcp_subr.c +0 -0
index fa61349cbb..4415801fbb 100644

slirp/tcp_subr.c tcp_emu(struct socket *so, struct mbuf *m) · line 642

Quoted 8 lines
slirp/tcp_subr.c +5 -0
@@ -635,6 +635,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)) {
+                m_free(m);
+                return 0;
+            }

Check looks correct, it should probably return 1.

Is there a reproducer?

Quoted 7 lines
slirp/tcp_subr.c +0 -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;
--

2.20.1

Signature · 1 line
Marc-André Lureau
author
#2 lore raw
+-- On Fri, 11 Jan 2019, Marc-André Lureau wrote --+
| > +            if (m->m_len > so_rcv->sb_datalen
| > +                            - (so_rcv->sb_wptr - so_rcv->sb_data)) {
| > +                m_free(m);
| > +                return 0;
| > +            }
| 
| Check looks correct, it should probably return 1.

Function comment says return 1 if 'm' is valid and should be appended via sbappend(). Not sure if unprocessed 'm' should go to sbappend().

| Is there a reproducer?

Yes, I have one.

Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F

#3 lore raw

Hi

Quoted 10 lines · P J P
+-- On Fri, 11 Jan 2019, Marc-André Lureau wrote --+
| > +            if (m->m_len > so_rcv->sb_datalen
| > +                            - (so_rcv->sb_wptr - so_rcv->sb_data)) {
| > +                m_free(m);
| > +                return 0;
| > +            }
|
| Check looks correct, it should probably return 1.
Quoted 2 lines

Function comment says return 1 if 'm' is valid and should be appended via sbappend(). Not sure if unprocessed 'm' should go to sbappend().

If you look at the rest of the function, many similar error cases return 1.

Quoted 3 lines

| Is there a reproducer?

Yes, I have one.

Ok, could you add it to the commit message ? :)

Quoted 5 lines

Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F

Signature · 1 line
Marc-André Lureau
author
#4 lore raw
+-- On Fri, 11 Jan 2019, Marc-André Lureau wrote --+
| > | Check looks correct, it should probably return 1.
| >
| > Function comment says return 1 if 'm' is valid and should be appended via
| > sbappend(). Not sure if unprocessed 'm' should go to sbappend().
| 
| If you look at the rest of the function, many similar error cases return 1.

True, not sure if that's right in this case. Nonetheless, I have sent a revised patch to return 1.

| Ok, could you add it to the commit message ? :)

No, I'm afraid not.

Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F