35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From 126c04acbabd7ad32c2b018fe10dfac2a3bc1210 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
|
Date: Sun, 28 Jul 2019 19:11:24 +0200
|
|
Subject: [PATCH] Fix heap overflow in ip_reass on big packet input
|
|
|
|
When the first fragment does not fit in the preallocated buffer, q will
|
|
already be pointing to the ext buffer, so we mustn't try to update it.
|
|
|
|
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
|
---
|
|
src/ip_input.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff -up ./slirp4netns-c4e1bc5a5e6987f3a352ca524f13320a2d483398/qemu/slirp/ip_input.c.CVE-2019-14378 ./slirp4netns-c4e1bc5a5e6987f3a352ca524f13320a2d483398/qemu/slirp/ip_input.c
|
|
--- slirp4netns-c4e1bc5a5e6987f3a352ca524f13320a2d483398/qemu/slirp/ip_input.c.CVE-2019-14378 2019-09-27 11:04:30.215413671 +0200
|
|
+++ slirp4netns-c4e1bc5a5e6987f3a352ca524f13320a2d483398/qemu/slirp/ip_input.c 2019-09-27 11:04:30.216413682 +0200
|
|
@@ -333,6 +333,8 @@ insert:
|
|
q = fp->frag_link.next;
|
|
m = dtom(slirp, q);
|
|
|
|
+ int was_ext = m->m_flags & M_EXT;
|
|
+
|
|
q = (struct ipasfrag *) q->ipf_next;
|
|
while (q != (struct ipasfrag*)&fp->frag_link) {
|
|
struct mbuf *t = dtom(slirp, q);
|
|
@@ -355,7 +357,7 @@ insert:
|
|
* the old buffer (in the mbuf), so we must point ip
|
|
* into the new buffer.
|
|
*/
|
|
- if (m->m_flags & M_EXT) {
|
|
+ if (!was_ext && m->m_flags & M_EXT) {
|
|
int delta = (char *)q - m->m_dat;
|
|
q = (struct ipasfrag *)(m->m_ext + delta);
|
|
}
|