Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.9.git;a=commitdiff;h=89c441d2aae84f1586aaf52e89cfaf29ec143055
commit 89c441d2aae84f1586aaf52e89cfaf29ec143055 Author: kikadf <[email protected]> Date: Wed Nov 5 10:56:12 2014 +0100 qemu-1.5.2-3arcturus7-x86_64 * Fix CVE-2014-3689, CVE-2014-7815 diff --git a/source/xapps-extra/qemu/CVE-2014-3689.patch b/source/xapps-extra/qemu/CVE-2014-3689.patch new file mode 100644 index 0000000..62ba62a --- /dev/null +++ b/source/xapps-extra/qemu/CVE-2014-3689.patch @@ -0,0 +1,34 @@ +From: Gerd Hoffmann <[email protected]> +Date: Wed, 29 Oct 2014 12:56:06 +0100 +Subject: [PATCH] vmware-vga: CVE-2014-3689: turn off hw accel + +Quick & easy stopgap for CVE-2014-3689: We just compile out the +hardware acceleration functions which lack sanity checks. Thankfully +we have capability bits for them (SVGA_CAP_RECT_COPY and +SVGA_CAP_RECT_FILL), so guests should deal just fine, in theory. + +Subsequent patches will add the missing checks and re-enable the +hardware acceleration emulation. + +Cc: [email protected] +Signed-off-by: Gerd Hoffmann <[email protected]> +Reviewed-by: Don Koch <[email protected]> +--- + hw/display/vmware_vga.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c +index a6a8cdc..113ce1f 100644 +--- a/hw/display/vmware_vga.c ++++ b/hw/display/vmware_vga.c +@@ -27,8 +27,10 @@ + #include "hw/pci/pci.h" + + #undef VERBOSE ++#if 0 + #define HW_RECT_ACCEL + #define HW_FILL_ACCEL ++#endif + #define HW_MOUSE_ACCEL + + #include "vga_int.h" diff --git a/source/xapps-extra/qemu/CVE-2014-7815.patch b/source/xapps-extra/qemu/CVE-2014-7815.patch new file mode 100644 index 0000000..dbebb5d --- /dev/null +++ b/source/xapps-extra/qemu/CVE-2014-7815.patch @@ -0,0 +1,45 @@ +From: Petr Matousek <[email protected]> +Date: Mon, 27 Oct 2014 12:41:44 +0100 +Subject: [PATCH] vnc: sanitize bits_per_pixel from the client + +bits_per_pixel that are less than 8 could result in accessing +non-initialized buffers later in the code due to the expectation +that bytes_per_pixel value that is used to initialize these buffers is +never zero. + +To fix this check that bits_per_pixel from the client is one of the +values that the rfb protocol specification allows. + +This is CVE-2014-7815. + +Signed-off-by: Petr Matousek <[email protected]> + +[ kraxel: apply codestyle fix ] + +Signed-off-by: Gerd Hoffmann <[email protected]> +(cherry picked from commit e6908bfe8e07f2b452e78e677da1b45b1c0f6829) +--- + ui/vnc.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/ui/vnc.c b/ui/vnc.c +index 5601cc3..edd514e 100644 +--- a/ui/vnc.c ++++ b/ui/vnc.c +@@ -2024,6 +2024,16 @@ static void set_pixel_format(VncState *vs, + return; + } + ++ switch (bits_per_pixel) { ++ case 8: ++ case 16: ++ case 32: ++ break; ++ default: ++ vnc_client_error(vs); ++ return; ++ } ++ + vs->client_pf.rmax = red_max; + vs->client_pf.rbits = hweight_long(red_max); + vs->client_pf.rshift = red_shift; diff --git a/source/xapps-extra/qemu/FrugalBuild b/source/xapps-extra/qemu/FrugalBuild index d409cb1..7d52868 100644 --- a/source/xapps-extra/qemu/FrugalBuild +++ b/source/xapps-extra/qemu/FrugalBuild @@ -9,7 +9,7 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=qemu pkgver=1.5.2 Fuse $USE_DEVEL && pkgver=svn6369 -pkgrel=3arcturus6 +pkgrel=3arcturus7 Fuse $USE_DEVEL && pkgrel=1 pkgdesc="QEMU is a FAST! processor emulator" url="http://www.nongnu.org/qemu/"; @@ -50,7 +50,8 @@ TARGETS="i386-softmmu x86_64-softmmu arm-softmmu" # FSA fix *** source=(${source[@]} CVE-2013-4344.patch CVE-2013-4375.patch CVE-2013-4377.patch CVE-2014-0150.patch CVE-2013-4544.patch CVE-2014-2894.patch - CVE-2014-3640.patch CVE-2014-3615.patch) + CVE-2014-3640.patch CVE-2014-3615.patch CVE-2014-3689.patch + CVE-2014-7815.patch) sha1sums=(${sha1sums[@]} '24acdb676d4bea695e7b0a2cb75efdebca92bb0f' \ '761b353dbbd110fd8e75e0e5f471effdc8e37beb' \ 'b50f8d0fcb307220ec670685835808dbd387fc7e' \ @@ -58,10 +59,13 @@ sha1sums=(${sha1sums[@]} '24acdb676d4bea695e7b0a2cb75efdebca92bb0f' \ 'f878bda3babc020d8c36b63b8c938acffc0bf29e' \ '145c2c32445247ca5249e03b7c1ee0b975b5914d' \ '47a312a667488b3be2c94ea2c7bb5bdcb923f247' \ - '3fe6dce9a5daac9088fdfdea86cfae3ab5c05f81') + '3fe6dce9a5daac9088fdfdea86cfae3ab5c05f81' \ + '1beb3322a61033344c0f6a80019160c26052872a' \ + 'dc3bf6ed322dfd24e4e7fc5031b2d19f27112ce4') # *********** + build() { if Fuse $USE_DEVEL; then _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
