diff options
| author | Armin Kuster <akuster@mvista.com> | 2016-09-19 19:56:19 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-23 23:21:43 +0100 |
| commit | 6d7c10eae8b23a71eee6d59baab42d98d8fb7ff8 (patch) | |
| tree | cfc6cdc361e0a9aa42da0336baac82e92ef2bc3d | |
| parent | 5729eb105ff69cae0eac7a596cb0e938f6159526 (diff) | |
| download | openembedded-core-6d7c10eae8b23a71eee6d59baab42d98d8fb7ff8.tar.gz openembedded-core-6d7c10eae8b23a71eee6d59baab42d98d8fb7ff8.tar.bz2 openembedded-core-6d7c10eae8b23a71eee6d59baab42d98d8fb7ff8.zip | |
qemu: Security fix for CVE-2016-4002
affects qemu < 2.6.0
Signed-off-by: Armin Kuster <akuster@mvista.com>
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2016-4002.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu_2.4.0.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-4002.patch b/meta/recipes-devtools/qemu/qemu/CVE-2016-4002.patch new file mode 100644 index 0000000000..69c11e27d9 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2016-4002.patch @@ -0,0 +1,39 @@ +From 7a2c32ec06533c54ddaf70136bfbd89eeaf6db16 Mon Sep 17 00:00:00 2001 +From: Prasad J Pandit <pjp@fedoraproject.org> +Date: Thu, 7 Apr 2016 15:56:02 +0530 +Subject: [PATCH] net: mipsnet: check packet length against buffer + +When receiving packets over MIPSnet network device, it uses +receive buffer of size 1514 bytes. In case the controller +accepts large(MTU) packets, it could lead to memory corruption. +Add check to avoid it. + +Reported by: Oleksandr Bazhaniuk <oleksandr.bazhaniuk@intel.com> +Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> +Signed-off-by: Jason Wang <jasowang@redhat.com> + +(cherry picked from commit 3af9187fc6caaf415ab9c0c6d92c9678f65cb17f) +Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> + +Upstream-Status: Backport +CVE: CVE-2016-4002 +Signed-off-by: Armin Kuster <akuster@mvista.com> + +--- + hw/net/mipsnet.c | 3 +++ + 1 file changed, 3 insertions(+) + +Index: qemu-2.4.0/hw/net/mipsnet.c +=================================================================== +--- qemu-2.4.0.orig/hw/net/mipsnet.c ++++ qemu-2.4.0/hw/net/mipsnet.c +@@ -82,6 +82,9 @@ static ssize_t mipsnet_receive(NetClient + if (!mipsnet_can_receive(nc)) + return 0; + ++ if (size >= sizeof(s->rx_buffer)) { ++ return 0; ++ } + s->busy = 1; + + /* Just accept everything. */ diff --git a/meta/recipes-devtools/qemu/qemu_2.4.0.bb b/meta/recipes-devtools/qemu/qemu_2.4.0.bb index 901a05737f..c33eb66c89 100644 --- a/meta/recipes-devtools/qemu/qemu_2.4.0.bb +++ b/meta/recipes-devtools/qemu/qemu_2.4.0.bb @@ -28,6 +28,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \ file://CVE-2016-4439.patch \ file://CVE-2016-6351_p1.patch \ file://CVE-2016-6351_p2.patch \ + file://CVE-2016-4002.patch \ " SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" SRC_URI[md5sum] = "186ee8194140a484a455f8e3c74589f4" |