<div dir="ltr">Looks like this is broken for ppc when building gobject-introspection:<div><br></div><div><a href="http://errors.yoctoproject.org/Errors/Latest/Autobuilder/?filter=%20gobject-introspection:%20do_compile&type=failure&page=1">http://errors.yoctoproject.org/Errors/Latest/Autobuilder/?filter=%20gobject-introspection:%20do_compile&type=failure&page=1</a><br></div><div><br></div><div>(top seven results in ross/mut2)</div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 12 January 2017 at 16:19, Aníbal Limón <span dir="ltr"><<a href="mailto:anibal.limon@linux.intel.com" target="_blank">anibal.limon@linux.intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">Rebased patches:<br>
<br>
- exclude-some-arm-EABI-<wbr>obsolete-syscalls.patc<br>
<br>
Removed patches (already in upstream):<br>
<br>
- 0001-pci-assign-sync-MSI-MSI-<wbr>X-cap-and-table-with-PCIDevi.<wbr>patch<br>
- 0002-fix-CVE-2016-7423.patch<br>
- 0003-fix-CVE-2016-7908.patch<br>
- 0004-fix-CVE-2016-7909.patch<br>
</span>- Qemu-Arm-versatilepb-Add-<wbr>memory-size-checking.patch<br>
- 0001-target-mips-add-24KEc-<wbr>CPU-definition.patch<br>
<span class=""><br>
Changelog,<br>
<br>
<a href="http://wiki.qemu.org/ChangeLog/2.8" rel="noreferrer" target="_blank">http://wiki.qemu.org/<wbr>ChangeLog/2.8</a><br>
<br>
Signed-off-by: Aníbal Limón <<a href="mailto:anibal.limon@linux.intel.com">anibal.limon@linux.intel.com</a>><br>
---<br>
</span> meta/conf/auto.conf | 6 ++<br>
meta/recipes-devtools/qemu/<wbr>qemu.inc | 3 -<br>
...sync-MSI-MSI-X-cap-and-<wbr>table-with-PCIDevi.patch | 71 ----------------------<br>
...0001-target-mips-add-24KEc-<wbr>CPU-definition.patch | 54 ----------------<br>
<span class=""> ...0001-virtio-zero-vq-inuse-<wbr>in-virtio_reset.patch | 57 -----------------<br>
.../qemu/qemu/0002-fix-CVE-<wbr>2016-7423.patch | 45 --------------<br>
.../qemu/qemu/0003-fix-CVE-<wbr>2016-7908.patch | 62 -------------------<br>
.../qemu/qemu/0004-fix-CVE-<wbr>2016-7909.patch | 42 -------------<br>
</span> ...-Arm-versatilepb-Add-<wbr>memory-size-checking.patch | 46 --------------<br>
.../exclude-some-arm-EABI-<wbr>obsolete-syscalls.patch | 28 ++++-----<br>
.../qemu/{<a href="http://qemu_2.7.0.bb" rel="noreferrer" target="_blank">qemu_2.7.0.bb</a> => <a href="http://qemu_2.8.0.bb" rel="noreferrer" target="_blank">qemu_2.8.0.bb</a>} | 10 +--<br>
11 files changed, 21 insertions(+), 403 deletions(-)<br>
create mode 100644 meta/conf/auto.conf<br>
delete mode 100644 meta/recipes-devtools/qemu/<wbr>qemu/0001-pci-assign-sync-MSI-<wbr>MSI-X-cap-and-table-with-<wbr>PCIDevi.patch<br>
delete mode 100644 meta/recipes-devtools/qemu/<wbr>qemu/0001-target-mips-add-<wbr>24KEc-CPU-definition.patch<br>
<span class=""> delete mode 100644 meta/recipes-devtools/qemu/<wbr>qemu/0001-virtio-zero-vq-<wbr>inuse-in-virtio_reset.patch<br>
delete mode 100644 meta/recipes-devtools/qemu/<wbr>qemu/0002-fix-CVE-2016-7423.<wbr>patch<br>
delete mode 100644 meta/recipes-devtools/qemu/<wbr>qemu/0003-fix-CVE-2016-7908.<wbr>patch<br>
delete mode 100644 meta/recipes-devtools/qemu/<wbr>qemu/0004-fix-CVE-2016-7909.<wbr>patch<br>
</span> delete mode 100644 meta/recipes-devtools/qemu/<wbr>qemu/Qemu-Arm-versatilepb-Add-<wbr>memory-size-checking.patch<br>
rename meta/recipes-devtools/qemu/{<a href="http://qemu_2.7.0.bb" rel="noreferrer" target="_blank">qe<wbr>mu_2.7.0.bb</a> => <a href="http://qemu_2.8.0.bb" rel="noreferrer" target="_blank">qemu_2.8.0.bb</a>} (58%)<br>
<br>
diff --git a/meta/conf/auto.conf b/meta/conf/auto.conf<br>
new file mode 100644<br>
index 0000000..492ac82<br>
--- /dev/null<br>
+++ b/meta/conf/auto.conf<br>
@@ -0,0 +1,6 @@<br>
+SSTATE_MIRRORS = "file://.* <a href="http://yctb01.zpn.intel.com/data/sstates/PATH" rel="noreferrer" target="_blank">http://yctb01.zpn.intel.com/<wbr>data/sstates/PATH</a> \n"<br>
+PREMIRRORS_prepend = "\<br>
+ git://.*/.* <a href="http://yctb01.zpn.intel.com/data/sources/" rel="noreferrer" target="_blank">http://yctb01.zpn.intel.com/<wbr>data/sources/</a> \n \<br>
+ ftp://.*/.* <a href="http://yctb01.zpn.intel.com/data/sources/" rel="noreferrer" target="_blank">http://yctb01.zpn.intel.com/<wbr>data/sources/</a> \n \<br>
+ http://.*/.* <a href="http://yctb01.zpn.intel.com/data/sources/" rel="noreferrer" target="_blank">http://yctb01.zpn.intel.com/<wbr>data/sources/</a> \n \<br>
+ https://.*/.* <a href="http://yctb01.zpn.intel.com/data/sources/" rel="noreferrer" target="_blank">http://yctb01.zpn.intel.com/<wbr>data/sources/</a> \n"<br>
diff --git a/meta/recipes-devtools/qemu/<wbr>qemu.inc b/meta/recipes-devtools/qemu/<wbr>qemu.inc<br>
index b46e7f7..e3af5c2 100644<br>
<span class="">--- a/meta/recipes-devtools/qemu/<wbr>qemu.inc<br>
+++ b/meta/recipes-devtools/qemu/<wbr>qemu.inc<br>
@@ -9,8 +9,6 @@ require qemu-targets.inc<br>
inherit autotools ptest<br>
BBCLASSEXTEND = "native nativesdk"<br>
<br>
-PR = "r1"<br>
-<br>
# QEMU_TARGETS is overridable variable<br>
QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc sh4 x86_64"<br>
<br>
</span>@@ -21,7 +19,6 @@ SRC_URI = "\<br>
file://wacom.patch \<br>
file://add-ptest-in-makefile.<wbr>patch \<br>
file://run-ptest \<br>
- file://0001-target-mips-add-<wbr>24KEc-CPU-definition.patch \<br>
"<br>
<br>
SRC_URI_append_class-native = "\<br>
<div><div class="h5">diff --git a/meta/recipes-devtools/qemu/<wbr>qemu/0001-pci-assign-sync-MSI-<wbr>MSI-X-cap-and-table-with-<wbr>PCIDevi.patch b/meta/recipes-devtools/qemu/<wbr>qemu/0001-pci-assign-sync-MSI-<wbr>MSI-X-cap-and-table-with-<wbr>PCIDevi.patch<br>
deleted file mode 100644<br>
index 03472dd..0000000<br>
--- a/meta/recipes-devtools/qemu/<wbr>qemu/0001-pci-assign-sync-MSI-<wbr>MSI-X-cap-and-table-with-<wbr>PCIDevi.patch<br>
+++ /dev/null<br>
@@ -1,71 +0,0 @@<br>
-From 6baa545df93253fced4fc0d52b14b9<wbr>8447e00473 Mon Sep 17 00:00:00 2001<br>
-From: Peter Xu <<a href="mailto:peterx@redhat.com">peterx@redhat.com</a>><br>
-Date: Mon, 28 Nov 2016 15:02:44 +0800<br>
-Subject: [PATCH] pci-assign: sync MSI/MSI-X cap and table with PCIDevice<br>
-<br>
-Since commit e1d4fb2d ("kvm-irqchip: x86: add msi route notify fn"),<br>
-kvm_irqchip_add_msi_route() starts to use pci_get_msi_message() to fetch<br>
-MSI info. This requires that we setup MSI related fields in PCIDevice.<br>
-For most devices, that won't be a problem, as long as we are using<br>
-general interfaces like msi_init()/msix_init().<br>
-<br>
-However, for pci-assign devices, MSI/MSI-X is treated differently - PCI<br>
-assign devices are maintaining its own MSI table and cap information in<br>
-AssignedDevice struct. however that's not synced up with PCIDevice's<br>
-fields. That will leads to pci_get_msi_message() failed to find correct<br>
-MSI capability, even with an NULL msix_table.<br>
-<br>
-A quick fix is to sync up the two places: both the capability bits and<br>
-table address for MSI/MSI-X.<br>
-<br>
-Upstream-Status: Backport [<a href="https://lists.gnu.org/archive/html/qemu-devel/2016-11/msg04649.html" rel="noreferrer" target="_blank">https://lists.gnu.org/<wbr>archive/html/qemu-devel/2016-<wbr>11/msg04649.html</a>]<br>
-<br>
-Reported-by: Changlimin <address@hidden><br>
-Tested-by: Changlimin <address@hidden><br>
-Cc: address@hidden<br>
-Fixes: e1d4fb2d ("kvm-irqchip: x86: add msi route notify fn")<br>
-Signed-off-by: Peter Xu <address@hidden><br>
-Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com">zhe.he@windriver.com</a>><br>
----<br>
- hw/i386/kvm/pci-assign.c | 4 ++++<br>
- 1 file changed, 4 insertions(+)<br>
-<br>
-diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c<br>
-index 8238fbc..87dcbdd 100644<br>
---- a/hw/i386/kvm/pci-assign.c<br>
-+++ b/hw/i386/kvm/pci-assign.c<br>
-@@ -1251,6 +1251,7 @@ static int assigned_device_pci_cap_init(<wbr>PCIDevice *pci_dev, Error **errp)<br>
- error_propagate(errp, local_err);<br>
- return -ENOTSUP;<br>
- }<br>
-+ dev->dev.cap_present |= QEMU_PCI_CAP_MSI;<br>
- dev->cap.available |= ASSIGNED_DEVICE_CAP_MSI;<br>
- /* Only 32-bit/no-mask currently supported */<br>
- ret = pci_add_capability2(pci_dev, PCI_CAP_ID_MSI, pos, 10,<br>
-@@ -1285,6 +1286,7 @@ static int assigned_device_pci_cap_init(<wbr>PCIDevice *pci_dev, Error **errp)<br>
- error_propagate(errp, local_err);<br>
- return -ENOTSUP;<br>
- }<br>
-+ dev->dev.cap_present |= QEMU_PCI_CAP_MSIX;<br>
- dev->cap.available |= ASSIGNED_DEVICE_CAP_MSIX;<br>
- ret = pci_add_capability2(pci_dev, PCI_CAP_ID_MSIX, pos, 12,<br>
- &local_err);<br>
-@@ -1648,6 +1650,7 @@ static void assigned_dev_register_msix_<wbr>mmio(AssignedDevice *dev, Error **errp)<br>
- dev->msix_table = NULL;<br>
- return;<br>
- }<br>
-+ dev->dev.msix_table = (uint8_t *)dev->msix_table;<br>
-<br>
- assigned_dev_msix_reset(dev);<br>
-<br>
-@@ -1665,6 +1668,7 @@ static void assigned_dev_unregister_msix_<wbr>mmio(AssignedDevice *dev)<br>
- error_report("error unmapping msix_table! %s", strerror(errno));<br>
- }<br>
- dev->msix_table = NULL;<br>
-+ dev->dev.msix_table = NULL;<br>
- }<br>
-<br>
- static const VMStateDescription vmstate_assigned_device = {<br>
---<br>
-2.8.3<br>
-<br>
</div></div>diff --git a/meta/recipes-devtools/qemu/<wbr>qemu/0001-target-mips-add-<wbr>24KEc-CPU-definition.patch b/meta/recipes-devtools/qemu/<wbr>qemu/0001-target-mips-add-<wbr>24KEc-CPU-definition.patch<br>
deleted file mode 100644<br>
index c4dbee7..0000000<br>
--- a/meta/recipes-devtools/qemu/<wbr>qemu/0001-target-mips-add-<wbr>24KEc-CPU-definition.patch<br>
+++ /dev/null<br>
@@ -1,54 +0,0 @@<br>
-From 926bc194f918d46bd93557b15da815<wbr>3b6a94a1d5 Mon Sep 17 00:00:00 2001<br>
-From: =?UTF-8?q?Andr=C3=A9=<wbr>20Draszik?= <<a href="mailto:git@andred.net">git@andred.net</a>><br>
-Date: Mon, 25 Jul 2016 23:58:22 +0100<br>
-Subject: [PATCH] target-mips: add 24KEc CPU definition<br>
-MIME-Version: 1.0<br>
-Content-Type: text/plain; charset=UTF-8<br>
-Content-Transfer-Encoding: 8bit<br>
-<br>
-Define a new CPU definition supporting 24KEc cores, similar to<br>
-the existing 24Kc, but with added support for DSP instructions<br>
-and MIPS16e (and without FPU).<br>
-<br>
-Signed-off-by: André Draszik <<a href="mailto:git@andred.net">git@andred.net</a>><br>
----<br>
-Upstream-Status: Submitted [<a href="http://lists.nongnu.org/archive/html/qemu-devel/2016-07/msg05778.html" rel="noreferrer" target="_blank">http://lists.nongnu.org/<wbr>archive/html/qemu-devel/2016-<wbr>07/msg05778.html</a>]<br>
- target-mips/translate_init.c | 22 ++++++++++++++++++++++<br>
- 1 file changed, 22 insertions(+)<br>
-<br>
-diff --git a/target-mips/translate_init.c b/target-mips/translate_init.c<br>
-index 39ed5c4..6ae23e4 100644<br>
---- a/target-mips/translate_init.c<br>
-+++ b/target-mips/translate_init.c<br>
-@@ -256,6 +256,28 @@ static const mips_def_t mips_defs[] =<br>
- .mmu_type = MMU_TYPE_R4000,<br>
- },<br>
- {<br>
-+ .name = "24KEc",<br>
-+ .CP0_PRid = 0x00019600,<br>
-+ .CP0_Config0 = MIPS_CONFIG0 | (0x1 << CP0C0_AR) |<br>
-+ (MMU_TYPE_R4000 << CP0C0_MT),<br>
-+ .CP0_Config1 = MIPS_CONFIG1 | (15 << CP0C1_MMU) |<br>
-+ (0 << CP0C1_IS) | (3 << CP0C1_IL) | (1 << CP0C1_IA) |<br>
-+ (0 << CP0C1_DS) | (3 << CP0C1_DL) | (1 << CP0C1_DA) |<br>
-+ (1 << CP0C1_CA),<br>
-+ .CP0_Config2 = MIPS_CONFIG2,<br>
-+ .CP0_Config3 = MIPS_CONFIG3 | (1 << CP0C3_DSPP) | (0 << CP0C3_VInt),<br>
-+ .CP0_LLAddr_rw_bitmask = 0,<br>
-+ .CP0_LLAddr_shift = 4,<br>
-+ .SYNCI_Step = 32,<br>
-+ .CCRes = 2,<br>
-+ /* we have a DSP, but no FPU */<br>
-+ .CP0_Status_rw_bitmask = 0x1378FF1F,<br>
-+ .SEGBITS = 32,<br>
-+ .PABITS = 32,<br>
-+ .insn_flags = CPU_MIPS32R2 | ASE_MIPS16 | ASE_DSP,<br>
-+ .mmu_type = MMU_TYPE_R4000,<br>
-+ },<br>
-+ {<br>
- .name = "24Kf",<br>
- .CP0_PRid = 0x00019300,<br>
- .CP0_Config0 = MIPS_CONFIG0 | (0x1 << CP0C0_AR) |<br>
---<br>
-2.8.1<br>
<div><div class="h5">-<br>
diff --git a/meta/recipes-devtools/qemu/<wbr>qemu/0001-virtio-zero-vq-<wbr>inuse-in-virtio_reset.patch b/meta/recipes-devtools/qemu/<wbr>qemu/0001-virtio-zero-vq-<wbr>inuse-in-virtio_reset.patch<br>
deleted file mode 100644<br>
index 86955d0..0000000<br>
--- a/meta/recipes-devtools/qemu/<wbr>qemu/0001-virtio-zero-vq-<wbr>inuse-in-virtio_reset.patch<br>
+++ /dev/null<br>
@@ -1,57 +0,0 @@<br>
-Upstream-Status: Backport<br>
-<br>
-Supplementary fix of CVE-2016-5403 which is backported from:<br>
-<br>
-<a href="http://git.qemu.org/?p=qemu.git;a=commit;h=4b7f91e" rel="noreferrer" target="_blank">http://git.qemu.org/?p=qemu.<wbr>git;a=commit;h=4b7f91e</a><br>
-<br>
-Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com">kai.kang@windriver.com</a>><br>
----<br>
-From 4b7f91ed0270a371e1933efa21ba60<wbr>0b6da23ab9 Mon Sep 17 00:00:00 2001<br>
-From: Stefan Hajnoczi <<a href="mailto:stefanha@redhat.com">stefanha@redhat.com</a>><br>
-Date: Wed, 7 Sep 2016 11:51:25 -0400<br>
-Subject: [PATCH] virtio: zero vq->inuse in virtio_reset()<br>
-<br>
-vq->inuse must be zeroed upon device reset like most other virtqueue<br>
-fields.<br>
-<br>
-In theory, virtio_reset() just needs assert(vq->inuse == 0) since<br>
-devices must clean up in-flight requests during reset (requests cannot<br>
-not be leaked!).<br>
-<br>
-In practice, it is difficult to achieve vq->inuse == 0 across reset<br>
-because balloon, blk, 9p, etc implement various different strategies for<br>
-cleaning up requests. Most devices call g_free(elem) directly without<br>
-telling virtio.c that the VirtQueueElement is cleaned up. Therefore<br>
-vq->inuse is not decremented during reset.<br>
-<br>
-This patch zeroes vq->inuse and trusts that devices are not leaking<br>
-VirtQueueElements across reset.<br>
-<br>
-I will send a follow-up series that refactors request life-cycle across<br>
-all devices and converts vq->inuse = 0 into assert(vq->inuse == 0) but<br>
-this more invasive approach is not appropriate for stable trees.<br>
-<br>
-Signed-off-by: Stefan Hajnoczi <<a href="mailto:stefanha@redhat.com">stefanha@redhat.com</a>><br>
-Cc: qemu-stable <<a href="mailto:qemu-stable@nongnu.org">qemu-stable@nongnu.org</a>><br>
-Reviewed-by: Michael S. Tsirkin <<a href="mailto:mst@redhat.com">mst@redhat.com</a>><br>
-Signed-off-by: Michael S. Tsirkin <<a href="mailto:mst@redhat.com">mst@redhat.com</a>><br>
-Reviewed-by: Ladi Prosek <<a href="mailto:lprosek@redhat.com">lprosek@redhat.com</a>><br>
----<br>
- hw/virtio/virtio.c | 1 +<br>
- 1 file changed, 1 insertion(+)<br>
-<br>
-diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c<br>
-index 74c085c..e8a13a5 100644<br>
---- a/hw/virtio/virtio.c<br>
-+++ b/hw/virtio/virtio.c<br>
-@@ -822,6 +822,7 @@ void virtio_reset(void *opaque)<br>
- vdev->vq[i].signalled_used_<wbr>valid = false;<br>
- vdev->vq[i].notification = true;<br>
- vdev->vq[i].vring.num = vdev->vq[i].vring.num_default;<br>
-+ vdev->vq[i].inuse = 0;<br>
- }<br>
- }<br>
-<br>
---<br>
-2.9.3<br>
-<br>
diff --git a/meta/recipes-devtools/qemu/<wbr>qemu/0002-fix-CVE-2016-7423.<wbr>patch b/meta/recipes-devtools/qemu/<wbr>qemu/0002-fix-CVE-2016-7423.<wbr>patch<br>
deleted file mode 100644<br>
index fdf58a3..0000000<br>
--- a/meta/recipes-devtools/qemu/<wbr>qemu/0002-fix-CVE-2016-7423.<wbr>patch<br>
+++ /dev/null<br>
@@ -1,45 +0,0 @@<br>
-Upstream-Status: Backport<br>
-<br>
-Backport patch to fix CVE-2016-7423 from:<br>
-<br>
-<a href="http://git.qemu.org/?p=qemu.git;a=commit;h=670e56d3ed" rel="noreferrer" target="_blank">http://git.qemu.org/?p=qemu.<wbr>git;a=commit;h=670e56d3ed</a><br>
-<br>
-CVE: CVE-2016-7423<br>
-<br>
-Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com">kai.kang@windriver.com</a>><br>
----<br>
-From 670e56d3ed2918b3861d9216f2c054<wbr>0d9e9ae0d5 Mon Sep 17 00:00:00 2001<br>
-From: Li Qiang <<a href="mailto:liqiang6-s@360.cn">liqiang6-s@360.cn</a>><br>
-Date: Mon, 12 Sep 2016 18:14:11 +0530<br>
-Subject: [PATCH] scsi: mptsas: use g_new0 to allocate MPTSASRequest object<br>
-<br>
-When processing IO request in mptsas, it uses g_new to allocate<br>
-a 'req' object. If an error occurs before 'req->sreq' is<br>
-allocated, It could lead to an OOB write in mptsas_free_request<br>
-function. Use g_new0 to avoid it.<br>
-<br>
-Reported-by: Li Qiang <<a href="mailto:liqiang6-s@360.cn">liqiang6-s@360.cn</a>><br>
-Signed-off-by: Prasad J Pandit <<a href="mailto:pjp@fedoraproject.org">pjp@fedoraproject.org</a>><br>
-Message-Id: <<a href="mailto:1473684251-17476-1-git-send-email-ppandit@redhat.com">1473684251-17476-1-git-send-<wbr>email-ppandit@redhat.com</a>><br>
-Cc: <a href="mailto:qemu-stable@nongnu.org">qemu-stable@nongnu.org</a><br>
-Signed-off-by: Paolo Bonzini <<a href="mailto:pbonzini@redhat.com">pbonzini@redhat.com</a>><br>
----<br>
- hw/scsi/mptsas.c | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c<br>
-index 0e0a22f..eaae1bb 100644<br>
---- a/hw/scsi/mptsas.c<br>
-+++ b/hw/scsi/mptsas.c<br>
-@@ -304,7 +304,7 @@ static int mptsas_process_scsi_io_<wbr>request(MPTSASState *s,<br>
- goto bad;<br>
- }<br>
-<br>
-- req = g_new(MPTSASRequest, 1);<br>
-+ req = g_new0(MPTSASRequest, 1);<br>
- QTAILQ_INSERT_TAIL(&s-><wbr>pending, req, next);<br>
- req->scsi_io = *scsi_io;<br>
- req->dev = s;<br>
---<br>
-2.9.3<br>
-<br>
diff --git a/meta/recipes-devtools/qemu/<wbr>qemu/0003-fix-CVE-2016-7908.<wbr>patch b/meta/recipes-devtools/qemu/<wbr>qemu/0003-fix-CVE-2016-7908.<wbr>patch<br>
deleted file mode 100644<br>
index 05cc3d9..0000000<br>
--- a/meta/recipes-devtools/qemu/<wbr>qemu/0003-fix-CVE-2016-7908.<wbr>patch<br>
+++ /dev/null<br>
@@ -1,62 +0,0 @@<br>
-Upstream-Status: Backport<br>
-<br>
-Backport patch to fix CVE-2016-7908 from:<br>
-<br>
-<a href="http://git.qemu.org/?p=qemu.git;a=commit;h=070c4b92b8c" rel="noreferrer" target="_blank">http://git.qemu.org/?p=qemu.<wbr>git;a=commit;h=070c4b92b8c</a><br>
-<br>
-CVE: CVE-2016-7908<br>
-<br>
-Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com">kai.kang@windriver.com</a>><br>
----<br>
-From 070c4b92b8cd5390889716677a0b92<wbr>444d6e087a Mon Sep 17 00:00:00 2001<br>
-From: Prasad J Pandit <<a href="mailto:pjp@fedoraproject.org">pjp@fedoraproject.org</a>><br>
-Date: Thu, 22 Sep 2016 16:02:37 +0530<br>
-Subject: [PATCH] net: mcf: limit buffer descriptor count<br>
-<br>
-ColdFire Fast Ethernet Controller uses buffer descriptors to manage<br>
-data flow to/fro receive & transmit queues. While transmitting<br>
-packets, it could continue to read buffer descriptors if a buffer<br>
-descriptor has length of zero and has crafted values in bd.flags.<br>
-Set upper limit to number of buffer descriptors.<br>
-<br>
-Reported-by: Li Qiang <<a href="mailto:liqiang6-s@360.cn">liqiang6-s@360.cn</a>><br>
-Signed-off-by: Prasad J Pandit <<a href="mailto:pjp@fedoraproject.org">pjp@fedoraproject.org</a>><br>
-Reviewed-by: Paolo Bonzini <<a href="mailto:pbonzini@redhat.com">pbonzini@redhat.com</a>><br>
-Signed-off-by: Jason Wang <<a href="mailto:jasowang@redhat.com">jasowang@redhat.com</a>><br>
----<br>
- hw/net/mcf_fec.c | 5 +++--<br>
- 1 file changed, 3 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c<br>
-index 0ee8ad9..d31fea1 100644<br>
---- a/hw/net/mcf_fec.c<br>
-+++ b/hw/net/mcf_fec.c<br>
-@@ -23,6 +23,7 @@ do { printf("mcf_fec: " fmt , ## __VA_ARGS__); } while (0)<br>
- #define DPRINTF(fmt, ...) do {} while(0)<br>
- #endif<br>
-<br>
-+#define FEC_MAX_DESC 1024<br>
- #define FEC_MAX_FRAME_SIZE 2032<br>
-<br>
- typedef struct {<br>
-@@ -149,7 +150,7 @@ static void mcf_fec_do_tx(mcf_fec_state *s)<br>
- uint32_t addr;<br>
- mcf_fec_bd bd;<br>
- int frame_size;<br>
-- int len;<br>
-+ int len, descnt = 0;<br>
- uint8_t frame[FEC_MAX_FRAME_SIZE];<br>
- uint8_t *ptr;<br>
-<br>
-@@ -157,7 +158,7 @@ static void mcf_fec_do_tx(mcf_fec_state *s)<br>
- ptr = frame;<br>
- frame_size = 0;<br>
- addr = s->tx_descriptor;<br>
-- while (1) {<br>
-+ while (descnt++ < FEC_MAX_DESC) {<br>
- mcf_fec_read_bd(&bd, addr);<br>
- DPRINTF("tx_bd %x flags %04x len %d data %08x\n",<br>
- addr, bd.flags, bd.length, bd.data);<br>
---<br>
-2.9.3<br>
-<br>
diff --git a/meta/recipes-devtools/qemu/<wbr>qemu/0004-fix-CVE-2016-7909.<wbr>patch b/meta/recipes-devtools/qemu/<wbr>qemu/0004-fix-CVE-2016-7909.<wbr>patch<br>
deleted file mode 100644<br>
index e71bbf6..0000000<br>
--- a/meta/recipes-devtools/qemu/<wbr>qemu/0004-fix-CVE-2016-7909.<wbr>patch<br>
+++ /dev/null<br>
@@ -1,42 +0,0 @@<br>
-Upstream-Status: Backport [<a href="http://git.qemu.org/?p=qemu.git;a=commit;h=34e29ce" rel="noreferrer" target="_blank">http://git.qemu.org/?p=qemu.<wbr>git;a=commit;h=34e29ce</a>]<br>
-CVE: CVE-2016-7909<br>
-<br>
-Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com">kai.kang@windriver.com</a>><br>
----<br>
-From 34e29ce754c02bb6b3bdd244fbb850<wbr>33460feaff Mon Sep 17 00:00:00 2001<br>
-From: Prasad J Pandit <<a href="mailto:pjp@fedoraproject.org">pjp@fedoraproject.org</a>><br>
-Date: Fri, 30 Sep 2016 00:27:33 +0530<br>
-Subject: [PATCH] net: pcnet: check rx/tx descriptor ring length<br>
-<br>
-The AMD PC-Net II emulator has set of control and status(CSR)<br>
-registers. Of these, CSR76 and CSR78 hold receive and transmit<br>
-descriptor ring length respectively. This ring length could range<br>
-from 1 to 65535. Setting ring length to zero leads to an infinite<br>
-loop in pcnet_rdra_addr() or pcnet_transmit(). Add check to avoid it.<br>
-<br>
-Reported-by: Li Qiang <<a href="mailto:liqiang6-s@360.cn">liqiang6-s@360.cn</a>><br>
-Signed-off-by: Prasad J Pandit <<a href="mailto:pjp@fedoraproject.org">pjp@fedoraproject.org</a>><br>
-Signed-off-by: Jason Wang <<a href="mailto:jasowang@redhat.com">jasowang@redhat.com</a>><br>
----<br>
- hw/net/pcnet.c | 3 +++<br>
- 1 file changed, 3 insertions(+)<br>
-<br>
-diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c<br>
-index 198a01f..3078de8 100644<br>
---- a/hw/net/pcnet.c<br>
-+++ b/hw/net/pcnet.c<br>
-@@ -1429,8 +1429,11 @@ static void pcnet_csr_writew(PCNetState *s, uint32_t rap, uint32_t new_value)<br>
- case 47: /* POLLINT */<br>
- case 72:<br>
- case 74:<br>
-+ break;<br>
- case 76: /* RCVRL */<br>
- case 78: /* XMTRL */<br>
-+ val = (val > 0) ? val : 512;<br>
-+ break;<br>
- case 112:<br>
- if (CSR_STOP(s) || CSR_SPND(s))<br>
- break;<br>
---<br>
-2.10.1<br>
-<br>
</div></div>diff --git a/meta/recipes-devtools/qemu/<wbr>qemu/Qemu-Arm-versatilepb-Add-<wbr>memory-size-checking.patch b/meta/recipes-devtools/qemu/<wbr>qemu/Qemu-Arm-versatilepb-Add-<wbr>memory-size-checking.patch<br>
deleted file mode 100644<br>
index 1a6cf51..0000000<br>
--- a/meta/recipes-devtools/qemu/<wbr>qemu/Qemu-Arm-versatilepb-Add-<wbr>memory-size-checking.patch<br>
+++ /dev/null<br>
@@ -1,46 +0,0 @@<br>
-From 896fa02c24347e6e9259812cfda187<wbr>b1d6ca6199 Mon Sep 17 00:00:00 2001<br>
-From: Jiang Lu <<a href="mailto:lu.jiang@windriver.com">lu.jiang@windriver.com</a>><br>
-Date: Wed, 13 Nov 2013 10:38:08 +0800<br>
-Subject: [PATCH] Qemu:Arm:versatilepb: Add memory size checking<br>
-<br>
-The machine can not work with memory over 256M, so add a checking<br>
-at startup. If the memory size exceed 256M, just stop emulation then<br>
-throw out warning about memory limitation.<br>
-<br>
-Upstream-Status: Pending<br>
-<br>
-Signed-off-by: Jiang Lu <<a href="mailto:lu.jiang@windriver.com">lu.jiang@windriver.com</a>><br>
-<br>
-Updated it on 2014-01-15 for rebasing<br>
-<br>
-Signed-off-by: Robert Yang <<a href="mailto:liezhi.yang@windriver.com">liezhi.yang@windriver.com</a>><br>
-<br>
-Update it when upgrade qemu to 2.2.0<br>
<span class="">-<br>
-Signed-off-by: Kai Kang <<a href="mailto:kai.kang@windriver.com">kai.kang@windriver.com</a>><br>
</span>-Signed-off-by: Cristian Iorga <<a href="mailto:cristian.iorga@intel.com">cristian.iorga@intel.com</a>><br>
----<br>
- hw/arm/versatilepb.c | 7 +++++++<br>
- 1 file changed, 7 insertions(+)<br>
-<br>
-diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c<br>
-index 6c69f4e..9278d90 100644<br>
---- a/hw/arm/versatilepb.c<br>
-+++ b/hw/arm/versatilepb.c<br>
-@@ -204,6 +204,13 @@ static void versatile_init(MachineState *machine, int board_id)<br>
- exit(1);<br>
- }<br>
-<br>
-+ if (machine->ram_size > (256 << 20)) {<br>
-+ fprintf(stderr,<br>
-+ "qemu: Too much memory for this machine: %d MB, maximum 256 MB\n",<br>
-+ ((unsigned int)ram_size / (1 << 20)));<br>
-+ exit(1);<br>
-+ }<br>
-+<br>
- cpuobj = object_new(object_class_get_<wbr>name(cpu_oc));<br>
-<br>
- /* By default ARM1176 CPUs have EL3 enabled. This board does not<br>
---<br>
-2.1.0<br>
<div><div class="h5">-<br>
diff --git a/meta/recipes-devtools/qemu/<wbr>qemu/exclude-some-arm-EABI-<wbr>obsolete-syscalls.patch b/meta/recipes-devtools/qemu/<wbr>qemu/exclude-some-arm-EABI-<wbr>obsolete-syscalls.patch<br>
index 171bda7..60253bd 100644<br>
--- a/meta/recipes-devtools/qemu/<wbr>qemu/exclude-some-arm-EABI-<wbr>obsolete-syscalls.patch<br>
+++ b/meta/recipes-devtools/qemu/<wbr>qemu/exclude-some-arm-EABI-<wbr>obsolete-syscalls.patch<br>
@@ -1,4 +1,7 @@<br>
-[PATCH] exclude some arm EABI obsolete syscalls<br>
+From 51910343594b3f655a205a096e092e<wbr>cdacc253da Mon Sep 17 00:00:00 2001<br>
+From: "Roy.Li" <<a href="mailto:rongqing.li@windriver.com">rongqing.li@windriver.com</a>><br>
+Date: Mon, 23 Jun 2014 14:28:30 +0800<br>
+Subject: [PATCH 02/11] [PATCH] exclude some arm EABI obsolete syscalls<br>
<br>
Upstream-Status: Pending<br>
<br>
@@ -26,15 +29,16 @@ or kernel header:<br>
/usr/include/asm/unistd.h<br>
<br>
Signed-off-by: Roy.Li <<a href="mailto:rongqing.li@windriver.com">rongqing.li@windriver.com</a>><br>
+<br>
---<br>
- qemu-seccomp.c | 14 ++++++++------<br>
- 1 file changed, 8 insertions(+), 6 deletions(-)<br>
+ qemu-seccomp.c | 13 ++++++++-----<br>
+ 1 file changed, 8 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/qemu-seccomp.c b/qemu-seccomp.c<br>
-index caa926e..5a78502 100644<br>
+index df75d9c..0e577f8 100644<br>
--- a/qemu-seccomp.c<br>
+++ b/qemu-seccomp.c<br>
-@@ -25,15 +25,21 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {<br>
+@@ -35,15 +35,21 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {<br>
{ SCMP_SYS(timer_settime), 255 },<br>
{ SCMP_SYS(timer_gettime), 254 },<br>
{ SCMP_SYS(futex), 253 },<br>
@@ -58,7 +62,7 @@ index caa926e..5a78502 100644<br>
{ SCMP_SYS(mprotect), 246 },<br>
{ SCMP_SYS(execve), 245 },<br>
{ SCMP_SYS(open), 245 },<br>
-@@ -48,13 +54,11 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {<br>
+@@ -58,7 +64,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {<br>
{ SCMP_SYS(bind), 245 },<br>
{ SCMP_SYS(listen), 245 },<br>
{ SCMP_SYS(semget), 245 },<br>
@@ -66,13 +70,7 @@ index caa926e..5a78502 100644<br>
{ SCMP_SYS(gettimeofday), 245 },<br>
{ SCMP_SYS(readlink), 245 },<br>
{ SCMP_SYS(access), 245 },<br>
- { SCMP_SYS(prctl), 245 },<br>
- { SCMP_SYS(signalfd), 245 },<br>
-- { SCMP_SYS(getrlimit), 245 },<br>
- { SCMP_SYS(set_tid_address), 245 },<br>
- { SCMP_SYS(statfs), 245 },<br>
- { SCMP_SYS(unlink), 245 },<br>
-@@ -93,7 +97,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {<br>
+@@ -104,7 +109,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {<br>
{ SCMP_SYS(times), 245 },<br>
{ SCMP_SYS(exit), 245 },<br>
{ SCMP_SYS(clock_gettime), 245 },<br>
@@ -80,7 +78,7 @@ index caa926e..5a78502 100644<br>
{ SCMP_SYS(restart_syscall), 245 },<br>
{ SCMP_SYS(pwrite64), 245 },<br>
{ SCMP_SYS(nanosleep), 245 },<br>
-@@ -182,7 +185,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {<br>
+@@ -194,7 +198,6 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = {<br>
{ SCMP_SYS(lstat64), 241 },<br>
{ SCMP_SYS(sendfile64), 241 },<br>
{ SCMP_SYS(ugetrlimit), 241 },<br>
@@ -89,5 +87,5 @@ index caa926e..5a78502 100644<br>
{ SCMP_SYS(rt_sigqueueinfo), 241 },<br>
{ SCMP_SYS(rt_tgsigqueueinfo), 241 },<br>
--<br>
-1.9.1<br>
+2.1.4<br>
<br>
diff --git a/meta/recipes-devtools/qemu/<a href="http://qemu_2.7.0.bb" rel="noreferrer" target="_blank">q<wbr>emu_2.7.0.bb</a> b/meta/recipes-devtools/qemu/<a href="http://qemu_2.8.0.bb" rel="noreferrer" target="_blank">q<wbr>emu_2.8.0.bb</a><br>
</div></div>similarity index 58%<br>
<span class="">rename from meta/recipes-devtools/qemu/<a href="http://qemu_2.7.0.bb" rel="noreferrer" target="_blank">qem<wbr>u_2.7.0.bb</a><br>
rename to meta/recipes-devtools/qemu/<a href="http://qemu_2.8.0.bb" rel="noreferrer" target="_blank">qem<wbr>u_2.8.0.bb</a><br>
</span>index 0d680a7..efb1fb0 100644<br>
--- a/meta/recipes-devtools/qemu/<a href="http://qemu_2.7.0.bb" rel="noreferrer" target="_blank">q<wbr>emu_2.7.0.bb</a><br>
+++ b/meta/recipes-devtools/qemu/<a href="http://qemu_2.8.0.bb" rel="noreferrer" target="_blank">q<wbr>emu_2.8.0.bb</a><br>
@@ -5,20 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=<wbr>441c28d2cf86e15a37fa47e15a72fb<wbr>ac \<br>
<br>
SRC_URI += "file://configure-fix-Darwin-<wbr>target-detection.patch \<br>
file://qemu-enlarge-env-entry-<wbr>size.patch \<br>
- file://Qemu-Arm-versatilepb-<wbr>Add-memory-size-checking.patch \<br>
<div class="HOEnZb"><div class="h5"> file://no-valgrind.patch \<br>
file://pathlimit.patch \<br>
file://qemu-2.5.0-cflags.patch \<br>
- file://0001-virtio-zero-vq-<wbr>inuse-in-virtio_reset.patch \<br>
- file://0002-fix-CVE-2016-7423.<wbr>patch \<br>
- file://0003-fix-CVE-2016-7908.<wbr>patch \<br>
- file://0004-fix-CVE-2016-7909.<wbr>patch \<br>
- file://0001-pci-assign-sync-<wbr>MSI-MSI-X-cap-and-table-with-<wbr>PCIDevi.patch \<br>
"<br>
<br>
SRC_URI_prepend = "<a href="http://wiki.qemu-project.org/download/${BP}.tar.bz2" rel="noreferrer" target="_blank">http://wiki.qemu-project.org/<wbr>download/${BP}.tar.bz2</a>"<br>
-SRC_URI[md5sum] = "<wbr>08d4d06d1cb598efecd796137f4844<wbr>ab"<br>
-SRC_URI[sha256sum] = "<wbr>326e739506ba690daf69fc17bd3913<wbr>a6c313d9928d743bd8eddb82f403f8<wbr>1e53"<br>
+SRC_URI[md5sum] = "<wbr>17940dce063b6ce450a12e719a6c9c<wbr>43"<br>
+SRC_URI[sha256sum] = "<wbr>dafd5d7f649907b6b617b822692f4c<wbr>82e60cf29bc0fc58bc2036219b591e<wbr>5e62"<br>
<br>
COMPATIBLE_HOST_mipsarchn32 = "null"<br>
COMPATIBLE_HOST_mipsarchn64 = "null"<br>
--<br>
2.1.4<br>
<br>
</div></div></blockquote></div><br></div>