Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=c81dacb6b73bd5bd49b43a1a505e5f6758a78699
commit c81dacb6b73bd5bd49b43a1a505e5f6758a78699 Author: Marius Cirsta <[email protected]> Date: Sun Dec 20 19:29:19 2015 +0200 qemu-2.5.0-1-x86_64 * rebuild with ncurses6 * version bump diff --git a/source/xapps-extra/qemu/CVE-2015-3456.patch b/source/xapps-extra/qemu/CVE-2015-3456.patch deleted file mode 100644 index 95f3dcc..0000000 --- a/source/xapps-extra/qemu/CVE-2015-3456.patch +++ /dev/null @@ -1,84 +0,0 @@ -From ac7ddbe342d7aa2303c39ca731cc6229dbbd739b Mon Sep 17 00:00:00 2001 -From: Petr Matousek <[email protected]> -Date: Wed, 6 May 2015 09:48:59 +0200 -Subject: [PATCH] fdc: force the fifo access to be in bounds of the allocated buffer - -During processing of certain commands such as FD_CMD_READ_ID and -FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could -get out of bounds leading to memory corruption with values coming -from the guest. - -Fix this by making sure that the index is always bounded by the -allocated memory. - -This is CVE-2015-3456. - -Signed-off-by: Petr Matousek <[email protected]> -Reviewed-by: John Snow <[email protected]> ---- - hw/block/fdc.c | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/hw/block/fdc.c b/hw/block/fdc.c -index f72a392..d8a8edd 100644 ---- a/hw/block/fdc.c -+++ b/hw/block/fdc.c -@@ -1497,7 +1497,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) - { - FDrive *cur_drv; - uint32_t retval = 0; -- int pos; -+ uint32_t pos; - - cur_drv = get_cur_drv(fdctrl); - fdctrl->dsr &= ~FD_DSR_PWRDOWN; -@@ -1506,8 +1506,8 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) - return 0; - } - pos = fdctrl->data_pos; -+ pos %= FD_SECTOR_LEN; - if (fdctrl->msr & FD_MSR_NONDMA) { -- pos %= FD_SECTOR_LEN; - if (pos == 0) { - if (fdctrl->data_pos != 0) - if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { -@@ -1852,10 +1852,13 @@ static void fdctrl_handle_option(FDCtrl *fdctrl, int direction) - static void fdctrl_handle_drive_specification_command(FDCtrl *fdctrl, int direction) - { - FDrive *cur_drv = get_cur_drv(fdctrl); -+ uint32_t pos; - -- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { -+ pos = fdctrl->data_pos - 1; -+ pos %= FD_SECTOR_LEN; -+ if (fdctrl->fifo[pos] & 0x80) { - /* Command parameters done */ -- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { -+ if (fdctrl->fifo[pos] & 0x40) { - fdctrl->fifo[0] = fdctrl->fifo[1]; - fdctrl->fifo[2] = 0; - fdctrl->fifo[3] = 0; -@@ -1955,7 +1958,7 @@ static uint8_t command_to_handler[256]; - static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) - { - FDrive *cur_drv; -- int pos; -+ uint32_t pos; - - /* Reset mode */ - if (!(fdctrl->dor & FD_DOR_nRESET)) { -@@ -2004,7 +2007,9 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) - } - - FLOPPY_DPRINTF("%s: %02x\n", __func__, value); -- fdctrl->fifo[fdctrl->data_pos++] = value; -+ pos = fdctrl->data_pos++; -+ pos %= FD_SECTOR_LEN; -+ fdctrl->fifo[pos] = value; - if (fdctrl->data_pos == fdctrl->data_len) { - /* We now have all parameters - * and will be able to treat the command --- -2.1.0 - - diff --git a/source/xapps-extra/qemu/FrugalBuild b/source/xapps-extra/qemu/FrugalBuild index ae1ddbf..9f91385 100644 --- a/source/xapps-extra/qemu/FrugalBuild +++ b/source/xapps-extra/qemu/FrugalBuild @@ -5,15 +5,16 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=qemu -pkgver=2.3.0 +pkgver=2.5.0 Fuse $USE_DEVEL && pkgver=svn6369 -pkgrel=2 +pkgrel=1 Fuse $USE_DEVEL && pkgrel=1 pkgdesc="QEMU is a FAST! processor emulator" url="http://www.nongnu.org/qemu/"; rodepends=('libcacard') -depends=('libx11' 'sdl' 'alsa-lib' 'cyrus-sasl' 'nss' 'libgl' 'pixman' 'libpng' 'libjpeg' 'spice-server' 'spice-protocol' 'usbredir>=0.7') -makedepends=('texi2html' 'xfsprogs' 'mesa-libgl-headers') +depends=('libx11' 'sdl' 'alsa-lib' 'cyrus-sasl' 'nss' 'libgl' 'pixman' 'libpng' 'libjpeg' 'spice-server' 'spice-protocol' 'usbredir>=0.7' \ + 'pulseaudio') +makedepends=('texi2html' 'xfsprogs' 'mesa-libgl-headers' 'x11-protos') replaces=('kqemu' 'qemu-kvm') conflicts=('kqemu' 'qemu-kvm') provides=('kqemu' 'qemu-kvm') @@ -21,14 +22,13 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="Flasttar http://wiki.qemu.org/download"; source=(http://wiki.qemu.org/download/${pkgname}-${pkgver//_/-}.tar.bz2 \ - qemu.conf 49-kvm.rules qemu-guest-agent.service 99-qemu-guest-agent.rules README.Frugalware CVE-2015-3456.patch) -sha1sums=('373d74bfafce1ca45f85195190d0a5e22b29299e' \ + qemu.conf 49-kvm.rules qemu-guest-agent.service 99-qemu-guest-agent.rules README.Frugalware) +sha1sums=('ed6c02a267f9edf98058743f0f76a25743a0dfe7' \ 'b44a774fe5ebcf52275ee0fc33a9654c157204ca' \ '9d9f293fb01d91c12e2f95ba6401a1f1570d70fb' \ '435373031bc0a1fed8abadab912460ddf98bc1c2' \ 'c997e6afd997aeb87791664c2583a009704a6792' \ - '11fea2f36b44297e241d8cbbdbc4cd14f1150b72' \ - 'b1e984f5fd20885978b7c9799ec3164b0a211fcc') + '11fea2f36b44297e241d8cbbdbc4cd14f1150b72') if Fuse $USE_DEVEL; then source=(${source[1]} ${source[2]} ${source[3]} ${source[4]} ${source[5]}) @@ -38,11 +38,11 @@ if Fuse $USE_DEVEL; then Finclude scm fi -subpkgs=('qemu-guest' 'libcacard') -subdescs=('Files for use in QEMU guests.' 'Common Access Card (CAC) Emulation') -subgroups=('apps-extra' 'lib-extra') -subarchs=('i686 x86_64' 'i686 x86_64') -subdepends=('glib2' 'glib2 nss') +subpkgs=('qemu-guest') +subdescs=('Files for use in QEMU guests.') +subgroups=('apps-extra') +subarchs=('i686 x86_64') +subdepends=('glib2') TARGETS="i386-softmmu x86_64-softmmu arm-softmmu" @@ -53,19 +53,15 @@ build() Funpack_scm fi Fcd $pkgname-${pkgver%%_*} - Fbuild --audio-drv-list=alsa,oss --target-list="$TARGETS" --disable-qom-cast-debug --enable-spice --enable-usb-redir + Fbuild --audio-drv-list='pa alsa sdl' --target-list="$TARGETS" --disable-qom-cast-debug --enable-spice --enable-usb-redir Fdoc README.Frugalware Ffile /etc/binfmt.d/qemu.conf Ffile /lib/udev/rules.d/49-kvm.rules Ffile /lib/systemd/system/qemu-guest-agent.service Ffile /lib/udev/rules.d/99-qemu-guest-agent.rules - Ffileschmod /usr/lib/libcacard.so.0.0.0 0755 Fsplit qemu-guest /lib/systemd/system/qemu-guest-agent.service Fsplit qemu-guest /lib/udev/rules.d/99-qemu-guest-agent.rules Fsplit qemu-guest /usr/bin/qemu-ga - Fsplit libcacard /usr/include - Fsplit libcacard /usr/lib - Fsplit libcacard /usr/bin/vscclient case $CARCH in i686) Fln qemu-system-i386 /usr/bin/qemu ;; x86_64) Fln qemu-system-x86_64 /usr/bin/qemu ;; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
