diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
commit | 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch) | |
tree | 230f3135ceaace633cf93e9838b185c4a6664c2e /app-emulation/qemu/files | |
parent | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff) |
gentoo resync : 23.09.2020
Diffstat (limited to 'app-emulation/qemu/files')
4 files changed, 90 insertions, 99 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 - diff --git a/app-emulation/qemu/files/qemu-5.1.0-usb-oob-CVE-2020-14364.patch b/app-emulation/qemu/files/qemu-5.1.0-usb-oob-CVE-2020-14364.patch new file mode 100644 index 000000000000..d1d23ec6f0e5 --- /dev/null +++ b/app-emulation/qemu/files/qemu-5.1.0-usb-oob-CVE-2020-14364.patch @@ -0,0 +1,90 @@ +https://bugs.gentoo.org/743649 + +From b946434f2659a182afc17e155be6791ebfb302eb Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann <kraxel@redhat.com> +Date: Tue, 25 Aug 2020 07:36:36 +0200 +Subject: [PATCH] usb: fix setup_len init (CVE-2020-14364) + +Store calculated setup_len in a local variable, verify it, and only +write it to the struct (USBDevice->setup_len) in case it passed the +sanity checks. + +This prevents other code (do_token_{in,out} functions specifically) +from working with invalid USBDevice->setup_len values and overrunning +the USBDevice->setup_buf[] buffer. + +Fixes: CVE-2020-14364 +Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> +Tested-by: Gonglei <arei.gonglei@huawei.com> +Reviewed-by: Li Qiang <liq3ea@gmail.com> +Message-id: 20200825053636.29648-1-kraxel@redhat.com +--- + hw/usb/core.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/hw/usb/core.c b/hw/usb/core.c +index 5abd128b6b..5234dcc73f 100644 +--- a/hw/usb/core.c ++++ b/hw/usb/core.c +@@ -129,6 +129,7 @@ void usb_wakeup(USBEndpoint *ep, unsigned int stream) + static void do_token_setup(USBDevice *s, USBPacket *p) + { + int request, value, index; ++ unsigned int setup_len; + + if (p->iov.size != 8) { + p->status = USB_RET_STALL; +@@ -138,14 +139,15 @@ static void do_token_setup(USBDevice *s, USBPacket *p) + usb_packet_copy(p, s->setup_buf, p->iov.size); + s->setup_index = 0; + p->actual_length = 0; +- s->setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6]; +- if (s->setup_len > sizeof(s->data_buf)) { ++ setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6]; ++ if (setup_len > sizeof(s->data_buf)) { + fprintf(stderr, + "usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n", +- s->setup_len, sizeof(s->data_buf)); ++ setup_len, sizeof(s->data_buf)); + p->status = USB_RET_STALL; + return; + } ++ s->setup_len = setup_len; + + request = (s->setup_buf[0] << 8) | s->setup_buf[1]; + value = (s->setup_buf[3] << 8) | s->setup_buf[2]; +@@ -259,26 +261,28 @@ static void do_token_out(USBDevice *s, USBPacket *p) + static void do_parameter(USBDevice *s, USBPacket *p) + { + int i, request, value, index; ++ unsigned int setup_len; + + for (i = 0; i < 8; i++) { + s->setup_buf[i] = p->parameter >> (i*8); + } + + s->setup_state = SETUP_STATE_PARAM; +- s->setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6]; + s->setup_index = 0; + + request = (s->setup_buf[0] << 8) | s->setup_buf[1]; + value = (s->setup_buf[3] << 8) | s->setup_buf[2]; + index = (s->setup_buf[5] << 8) | s->setup_buf[4]; + +- if (s->setup_len > sizeof(s->data_buf)) { ++ setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6]; ++ if (setup_len > sizeof(s->data_buf)) { + fprintf(stderr, + "usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n", +- s->setup_len, sizeof(s->data_buf)); ++ setup_len, sizeof(s->data_buf)); + p->status = USB_RET_STALL; + return; + } ++ s->setup_len = setup_len; + + if (p->pid == USB_TOKEN_OUT) { + usb_packet_copy(p, s->data_buf, s->setup_len); +-- +2.28.0 + diff --git a/app-emulation/qemu/files/qemu-9999-format-error.patch b/app-emulation/qemu/files/qemu-9999-format-error.patch deleted file mode 100644 index 8bb4d96b77cf..000000000000 --- a/app-emulation/qemu/files/qemu-9999-format-error.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/740836 ---- a/meson.build -+++ b/meson.build -@@ -255,8 +255,8 @@ if sdl.found() - method: 'pkg-config', static: enable_static) - else - if get_option('sdl_image').enabled() -- error('sdl-image required, but SDL was @0@', -- get_option('sdl').disabled() ? 'disabled' : 'not found') -+ error('sdl-image required, but SDL was @0@'.format( -+ get_option('sdl').disabled() ? 'disabled' : 'not found')) - endif - sdl_image = not_found - endif |