Index: branches/2017Q1/sysutils/xen-tools/Makefile =================================================================== --- branches/2017Q1/sysutils/xen-tools/Makefile (revision 434070) +++ branches/2017Q1/sysutils/xen-tools/Makefile (revision 434071) @@ -1,86 +1,86 @@ # $FreeBSD$ PORTNAME= xen PKGNAMESUFFIX= -tools PORTVERSION= 4.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils emulators MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ MAINTAINER= royger@FreeBSD.org COMMENT= Xen management tool, based on LibXenlight LICENSE= GPLv2 LGPL3 LICENSE_COMB= multi BROKEN_FreeBSD_10= does not build LIB_DEPENDS= libyajl.so:devel/yajl \ liblzo2.so:archivers/lzo2 \ libpixman-1.so:x11/pixman \ libargp.so:devel/argp-standalone BUILD_DEPENDS= dev86>0:devel/dev86 \ seabios>0:misc/seabios \ markdown>0:textproc/markdown OPTIONS_DEFINE= DOCS ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than amd64" USES= cpe gettext gmake libtool localbase:ldflags perl5 pkgconfig \ python shebangfix USE_GNOME= glib20 USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_ARGS= clang=y QEMU_ARGS= --disable-gtk \ --disable-smartcard-nss \ --disable-sdl \ --disable-vte \ --disable-curses \ --disable-tools \ --disable-curl \ --cxx=c++ EXTRA_PATCHES= ${FILESDIR}/var_paths.patch:-p1 \ ${FILESDIR}/xsa198.patch:-p1 \ ${FILESDIR}/0001-libxl-fix-creation-of-pkgconf-install-dir.patch \ ${FILESDIR}/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch \ ${FILESDIR}/0001-libs-xenstore-set-correct-FreeBSD-device.patch CONFIGURE_ARGS+= --with-extra-qemuu-configure-args="${QEMU_ARGS}" \ --with-system-seabios=${LOCALBASE}/share/seabios/bios.bin # Disable bash and xgettext tests, they are not needed on FreeBSD. CONFIGURE_ENV+= ac_cv_path_BASH=${TRUE} SHEBANG_FILES= tools/misc/xencov_split \ tools/misc/xen-ringwatch ALL_TARGET= tools docs INSTALL_TARGET= install-tools install-docs .include .if ${OPSYS} != FreeBSD IGNORE= only supported on FreeBSD .endif post-patch: @${REINPLACE_CMD} "s,x86_64,amd64,g" ${WRKSRC}/tools/configure @${REINPLACE_CMD} -e "s,/var/lib,/var/db,g" \ ${WRKSRC}/tools/Makefile \ ${WRKSRC}/tools/libxc/include/xenguest.h \ ${WRKSRC}/tools/libxl/libxl_dom.c \ ${WRKSRC}/tools/libxl/libxl_dm.c \ ${WRKSRC}/tools/qemu-xen-traditional/i386-dm/helper2.c \ ${WRKSRC}/docs/man/* @for p in `ls ${FILESDIR}/*qemuu*.patch 2>/dev/null`; do \ ${ECHO_CMD} "====> Applying $${p##*/}" ; \ ${PATCH} -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen ; \ done post-install: ${MKDIR} ${STAGEDIR}/var/run/xen .include Index: branches/2017Q1/sysutils/xen-tools/files/xsa208-qemuu.patch =================================================================== --- branches/2017Q1/sysutils/xen-tools/files/xsa208-qemuu.patch (revision 434070) +++ branches/2017Q1/sysutils/xen-tools/files/xsa208-qemuu.patch (revision 434071) @@ -1,45 +1,53 @@ -From: Li Qiang +From 7eaaf4ba68fab40f1945d761438bdaa44fbf37d7 Mon Sep 17 00:00:00 2001 +From: Li Qiang +Date: Thu, 9 Feb 2017 14:36:41 -0800 +Subject: [PATCH] cirrus: fix oob access issue (CVE-2017-2615) When doing bitblt copy in backward mode, we should minus the blt width first just like the adding in the forward mode. This can avoid the oob access of the front of vga's vram. -Signed-off-by: Li Qiang -Message-id: address@hidden +This is XSA-208. +upstream-commit-id: 62d4c6bd5263bb8413a06c80144fc678df6dfb64 + +Signed-off-by: Li Qiang + { kraxel: with backward blits (negative pitch) addr is the topmost address, so check it as-is against vram size ] -[ This is CVE-2017-2615 / XSA-208 - Ian Jackson ] - -Cc: address@hidden -Cc: P J P -Cc: Laszlo Ersek -Cc: Paolo Bonzini -Cc: Wolfgang Bumiller +Cc: qemu-stable@nongnu.org +Cc: P J P +Cc: Laszlo Ersek +Cc: Paolo Bonzini +Cc: Wolfgang Bumiller Fixes: d3532a0db02296e687711b8cdc7791924efccea0 (CVE-2014-8106) -Signed-off-by: Gerd Hoffmann +Signed-off-by: Gerd Hoffmann +Message-id: 1485938101-26602-1-git-send-email-kraxel@redhat.com +Reviewed-by: Laszlo Ersek +Signed-off-by: Stefano Stabellini --- hw/display/cirrus_vga.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c -index bdb092e..3bbe3d5 100644 +index 5198037..7bf3707 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c -@@ -277,10 +277,9 @@ static bool blit_region_is_unsafe(struct CirrusVGAState *s, - } +@@ -272,10 +272,9 @@ static bool blit_region_is_unsafe(struct CirrusVGAState *s, + { if (pitch < 0) { int64_t min = addr - + ((int64_t)s->cirrus_blt_height-1) * pitch; - int32_t max = addr - + s->cirrus_blt_width; -- if (min < 0 || max > s->vga.vram_size) { +- if (min < 0 || max >= s->vga.vram_size) { + + ((int64_t)s->cirrus_blt_height - 1) * pitch + - s->cirrus_blt_width; + if (min < -1 || addr >= s->vga.vram_size) { return true; } } else { -- -1.8.3.1 +2.10.1 (Apple Git-78) + Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 434070) +++ branches/2017Q1 (revision 434071) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r434070