|
 |
9ae3a8 |
From 90b1929638fb5fed4e5fc65f95b7a76e339e0640 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 9 Sep 2019 09:13:33 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 01/12] Using ip_deq after m_free might read pointers from an
|
|
|
9ae3a8 |
allocation reuse.
|
|
|
9ae3a8 |
MIME-Version: 1.0
|
|
|
9ae3a8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9ae3a8 |
Content-Transfer-Encoding: 8bit
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
9ae3a8 |
Message-id: <20190909091333.18511-2-philmd@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 90336
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.8 qemu-kvm PATCH 1/1] Using ip_deq after m_free might read pointers from an allocation reuse.
|
|
|
9ae3a8 |
Bugzilla: 1749735
|
|
|
9ae3a8 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
This would be difficult to exploit, but that is still related with
|
|
|
9ae3a8 |
CVE-2019-14378 which generates fragmented IP packets that would trigger this
|
|
|
9ae3a8 |
issue and at least produce a DoS.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
|
|
9ae3a8 |
(cherry picked from libslirp commit c59279437eda91841b9d26079c70b8a540d41204)
|
|
|
9ae3a8 |
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
slirp/ip_input.c | 6 ++++--
|
|
|
9ae3a8 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/slirp/ip_input.c b/slirp/ip_input.c
|
|
|
9ae3a8 |
index 5226224..9e95b40 100644
|
|
|
9ae3a8 |
--- a/slirp/ip_input.c
|
|
|
9ae3a8 |
+++ b/slirp/ip_input.c
|
|
|
9ae3a8 |
@@ -296,6 +296,7 @@ ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp)
|
|
|
9ae3a8 |
*/
|
|
|
9ae3a8 |
while (q != (struct ipasfrag*)&fp->frag_link &&
|
|
|
9ae3a8 |
ip->ip_off + ip->ip_len > q->ipf_off) {
|
|
|
9ae3a8 |
+ struct ipasfrag *prev;
|
|
|
9ae3a8 |
i = (ip->ip_off + ip->ip_len) - q->ipf_off;
|
|
|
9ae3a8 |
if (i < q->ipf_len) {
|
|
|
9ae3a8 |
q->ipf_len -= i;
|
|
|
9ae3a8 |
@@ -303,9 +304,10 @@ ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp)
|
|
|
9ae3a8 |
m_adj(dtom(slirp, q), i);
|
|
|
9ae3a8 |
break;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
+ prev = q;
|
|
|
9ae3a8 |
q = q->ipf_next;
|
|
|
9ae3a8 |
- m_free(dtom(slirp, q->ipf_prev));
|
|
|
9ae3a8 |
- ip_deq(q->ipf_prev);
|
|
|
9ae3a8 |
+ ip_deq(prev);
|
|
|
9ae3a8 |
+ m_free(dtom(slirp, prev));
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
insert:
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|