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 15:27:06 +0100 |
commit | 11c8c8aa155f134679fe0d2a12a8943a8d6b8c05 (patch) | |
tree | eb332ba5689b97f8367d7c182cc41ed3be446e12 /meta/recipes-devtools/qemu/qemu | |
parent | 5a8a6a753fbcbdf8fc42c8bb6e8267f4e0023629 (diff) | |
download | poky-11c8c8aa155f134679fe0d2a12a8943a8d6b8c05.tar.gz |
qemu: Security fix for CVE-2016-4002
affects qemu < 2.6.0
(From OE-Core rev: 4c6493e90c7102a5bfa8aba4c00b112d083e91b8)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2016-4002.patch | 39 |
1 files changed, 39 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 @@ | |||
1 | From 7a2c32ec06533c54ddaf70136bfbd89eeaf6db16 Mon Sep 17 00:00:00 2001 | ||
2 | From: Prasad J Pandit <pjp@fedoraproject.org> | ||
3 | Date: Thu, 7 Apr 2016 15:56:02 +0530 | ||
4 | Subject: [PATCH] net: mipsnet: check packet length against buffer | ||
5 | |||
6 | When receiving packets over MIPSnet network device, it uses | ||
7 | receive buffer of size 1514 bytes. In case the controller | ||
8 | accepts large(MTU) packets, it could lead to memory corruption. | ||
9 | Add check to avoid it. | ||
10 | |||
11 | Reported by: Oleksandr Bazhaniuk <oleksandr.bazhaniuk@intel.com> | ||
12 | Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> | ||
13 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
14 | |||
15 | (cherry picked from commit 3af9187fc6caaf415ab9c0c6d92c9678f65cb17f) | ||
16 | Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> | ||
17 | |||
18 | Upstream-Status: Backport | ||
19 | CVE: CVE-2016-4002 | ||
20 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
21 | |||
22 | --- | ||
23 | hw/net/mipsnet.c | 3 +++ | ||
24 | 1 file changed, 3 insertions(+) | ||
25 | |||
26 | Index: qemu-2.4.0/hw/net/mipsnet.c | ||
27 | =================================================================== | ||
28 | --- qemu-2.4.0.orig/hw/net/mipsnet.c | ||
29 | +++ qemu-2.4.0/hw/net/mipsnet.c | ||
30 | @@ -82,6 +82,9 @@ static ssize_t mipsnet_receive(NetClient | ||
31 | if (!mipsnet_can_receive(nc)) | ||
32 | return 0; | ||
33 | |||
34 | + if (size >= sizeof(s->rx_buffer)) { | ||
35 | + return 0; | ||
36 | + } | ||
37 | s->busy = 1; | ||
38 | |||
39 | /* Just accept everything. */ | ||