SECURITY fix for CVE-2015-8613; from Brad (maintainer)

While here, fix path to smbd(8); reported by mlarkin@

emulators/qemu/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.137 2015/12/16 06:41:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.138 2015/12/22 06:43:05 ajacoutot Exp $
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc sparc64
 
 COMMENT=	multi system emulator
 
 DISTNAME=	qemu-2.2.1
-REVISION=	13
+REVISION=	14
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 EXTRACT_SUFX=	.tar.bz2
@@ -62,7 +62,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--sysconfdir=${SYSCONFDIR} \
 		--mandir=${PREFIX}/man \
 		--python=${MODPY_BIN} \
-		--smbd=${LOCALBASE}/libexec/smbd \
+		--smbd=${LOCALBASE}/sbin/smbd \
 		--cc="${CC}" \
 		--cxx="${CXX}" \
 		--host-cc="${CC}" \

emulators/qemu/patches/patch-hw_scsi_megasas_c

@@ -0,0 +1,21 @@
+$OpenBSD: patch-hw_scsi_megasas_c,v 1.1 2015/12/22 06:43:05 ajacoutot Exp $
+
+scsi: initialise info object with appropriate size
+
+While processing controller 'CTRL_GET_INFO' command, the routine
+'megasas_ctrl_get_info' overflows the '&info' object size. Use its
+appropriate size to null initialise it.
+
+CVE-2015-8613
+
+--- hw/scsi/megasas.c.orig	Mon Dec 21 20:22:57 2015
++++ hw/scsi/megasas.c	Mon Dec 21 20:23:52 2015
+@@ -721,7 +721,7 @@ static int megasas_ctrl_get_info(MegasasState *s, Mega
+     BusChild *kid;
+     int num_pd_disks = 0;
+ 
+-    memset(&info, 0x0, cmd->iov_size);
++    memset(&info, 0x0, dcmd_size);
+     if (cmd->iov_size < dcmd_size) {
+         trace_megasas_dcmd_invalid_xfer_len(cmd->index, cmd->iov_size,
+                                             dcmd_size);