diff options
-rw-r--r-- | app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch | 50 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-5.0.0-ipv6-slirp-CVE-2020-10756.patch | 35 |
2 files changed, 0 insertions, 85 deletions
diff --git a/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch b/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch deleted file mode 100644 index c0f9a2e008d0..000000000000 --- a/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://lists.nongnu.org/archive/html/qemu-devel/2020-04/msg02643.html - -From 6bce23d8daf96a7faa9288e7414948cda31ddaa2 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Thu, 16 Apr 2020 18:55:49 +0100 -Subject: [PATCH] linux-user/strace.list: fix epoll_create{,1} -strace output - -Fix syscall name and parameters priinter. - -Before the change: - -``` -$ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a -... -1274697 %s(%d)(2097152,274903156744,274903156760,274905840712,274877908880,274903235616) = 3 -1274697 exit_group(0) -``` - -After the change: - -``` -$ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a -... -1273719 epoll_create1(2097152) = 3 -1273719 exit_group(0) -``` - -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - linux-user/strace.list | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/linux-user/strace.list -+++ b/linux-user/strace.list -@@ -125,10 +125,10 @@ - { TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL }, - #endif - #ifdef TARGET_NR_epoll_create --{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL }, -+{ TARGET_NR_epoll_create, "epoll_create", "%s(%d)", NULL, NULL }, - #endif - #ifdef TARGET_NR_epoll_create1 --{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL }, -+{ TARGET_NR_epoll_create1, "epoll_create1", "%s(%d)", NULL, NULL }, - #endif - #ifdef TARGET_NR_epoll_ctl - { TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL }, --- -2.26.2 - diff --git a/app-emulation/qemu/files/qemu-5.0.0-ipv6-slirp-CVE-2020-10756.patch b/app-emulation/qemu/files/qemu-5.0.0-ipv6-slirp-CVE-2020-10756.patch deleted file mode 100644 index d1d3c49a58f6..000000000000 --- a/app-emulation/qemu/files/qemu-5.0.0-ipv6-slirp-CVE-2020-10756.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://gitlab.freedesktop.org/slirp/libslirp/-/commit/c7ede54cbd2e2b25385325600958ba0124e31cc0 -https://bugzilla.redhat.com/show_bug.cgi?id=1835986 -https://bugs.gentoo.org/731992 - -From c7ede54cbd2e2b25385325600958ba0124e31cc0 Mon Sep 17 00:00:00 2001 -From: Ralf Haferkamp <rhafer@suse.com> -Date: Fri, 3 Jul 2020 14:51:16 +0200 -Subject: [PATCH] Drop bogus IPv6 messages - -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(). ---- - src/ip6_input.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- 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); --- -GitLab - |