49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
|
From 202f3d96a327b1fd7f9f15a692b946e81e855456 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
Date: Tue, 19 Jan 2021 22:59:56 -0500
|
||
|
|
Subject: [PATCH] Drop bogus IPv6 messages
|
||
|
|
|
||
|
|
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
Message-id: <20210119225956.1346483-2-jmaloy@redhat.com>
|
||
|
|
Patchwork-id: 100693
|
||
|
|
O-Subject: [RHEL-8.3.0.z qemu-kvm PATCH 1/1] Drop bogus IPv6 messages
|
||
|
|
Bugzilla: 1939493
|
||
|
|
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
||
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
||
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
|
||
|
|
From: Ralf Haferkamp <rhafer@suse.com>
|
||
|
|
|
||
|
|
Drop IPv6 message shorter than what's mentioned in the payload
|
||
|
|
length header (+ the size of the IPv6 header). They're invalid an could
|
||
|
|
lead to data leakage in icmp6_send_echoreply().
|
||
|
|
|
||
|
|
(cherry picked from libslirp commit c7ede54cbd2e2b25385325600958ba0124e31cc0)
|
||
|
|
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
slirp/src/ip6_input.c | 7 +++++++
|
||
|
|
1 file changed, 7 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/slirp/src/ip6_input.c b/slirp/src/ip6_input.c
|
||
|
|
index d9d2b7e9cd..0f2b17853a 100644
|
||
|
|
--- a/slirp/src/ip6_input.c
|
||
|
|
+++ b/slirp/src/ip6_input.c
|
||
|
|
@@ -49,6 +49,13 @@ void ip6_input(struct mbuf *m)
|
||
|
|
goto bad;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Check if the message size is big enough to hold what's
|
||
|
|
+ // set in the payload length header. If not this is an invalid
|
||
|
|
+ // packet
|
||
|
|
+ if (m->m_len < ntohs(ip6->ip_pl) + sizeof(struct ip6)) {
|
||
|
|
+ goto bad;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/* check ip_ttl for a correct ICMP reply */
|
||
|
|
if (ip6->ip_hl == 0) {
|
||
|
|
icmp6_send_error(m, ICMP6_TIMXCEED, ICMP6_TIMXCEED_INTRANS);
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|