diff options
author | Sona Sarmadi <sona.sarmadi@enea.com> | 2017-05-10 14:17:31 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2017-05-11 15:28:36 +0200 |
commit | 07c94f74cda62c672e7e80292f917a76e1214be0 (patch) | |
tree | 2de451ef1dfb9fb55d90f1c4dcf5bf492dbce40e /meta/recipes-devtools/qemu/qemu/CVE-2016-2857.patch | |
parent | 3fc5d271f554e07c88b1195812e48a0d86291395 (diff) | |
download | poky-07c94f74cda62c672e7e80292f917a76e1214be0.tar.gz |
qemu: updgrade to 2.5.1
This upgrade includes several worthwhile fixes, security and otherwise, including
a complete fix for CVE-2016-2857.
* drop CVE-2016-2857.patch as it's included in this release, along with several
related patches which complete the fixes for CVE-2016-2857:
http://git.qemu.org/?p=qemu.git;a=commitdiff;h=9bddb45dbc010cd8ee4d48bd501fa5d18dcec00c
http://git.qemu.org/?p=qemu.git;a=commitdiff;h=e3a2cdfcb5e282139217924044ec5af00c7f8eed
http://git.qemu.org/?p=qemu.git;a=commitdiff;h=fe90bdc25bcf9954ee286cd51de94776a17d04f6
http://git.qemu.org/?p=qemu.git;a=commitdiff;h=d0ee85b4e4c6cc2c8fac311d6df2ed412ed0df5f
http://git.qemu.org/?p=qemu.git;a=commitdiff;h=80b6e5723fac428ea6c08c821078286f43975df8
http://git.qemu.org/?p=qemu.git;a=commitdiff;h=a375e0b03ee3438924b24a45e61ee189ec9361db
* drop CVE-2016-2197.patch as an equivalent fix is included in this release
http://git.qemu.org/?p=qemu.git;a=commitdiff;h=aaf4fb6afb4653c86059255811886a5c4ea271f3
* drop CVE-2016-1568.patch as it's included in this release
http://git.qemu.org/?p=qemu.git;a=commitdiff;h=4f046a6ba1d558eb043dc13a80d40cf7cb62ef95
(From OE-Core rev: 8332cea4baf2bda81fa4d33ccedefaec4313d454)
This patch is backported from upstream morty branch:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/patch/?id=c63c1aaaa6f2f2ad583e8e513308acab18841c83
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/CVE-2016-2857.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2016-2857.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-2857.patch b/meta/recipes-devtools/qemu/qemu/CVE-2016-2857.patch deleted file mode 100644 index 73cfa2a1eb..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2016-2857.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From 362786f14a753d8a5256ef97d7c10ed576d6572b Mon Sep 17 00:00:00 2001 | ||
2 | From: Prasad J Pandit <pjp@fedoraproject.org> | ||
3 | Date: Wed, 2 Mar 2016 17:29:58 +0530 | ||
4 | Subject: [PATCH] net: check packet payload length | ||
5 | |||
6 | While computing IP checksum, 'net_checksum_calculate' reads | ||
7 | payload length from the packet. It could exceed the given 'data' | ||
8 | buffer size. Add a check to avoid it. | ||
9 | |||
10 | Reported-by: Liu Ling <liuling-it@360.cn> | ||
11 | Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> | ||
12 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
13 | |||
14 | Upstream-Status: Backport | ||
15 | CVE: CVE-2016-2857 | ||
16 | |||
17 | http://git.qemu.org/?p=qemu.git;a=commit;h=362786f14a753d8a5256ef97d7c10ed576d6572b | ||
18 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
19 | |||
20 | --- | ||
21 | net/checksum.c | 10 ++++++++-- | ||
22 | 1 file changed, 8 insertions(+), 2 deletions(-) | ||
23 | |||
24 | Index: qemu-2.5.0/net/checksum.c | ||
25 | =================================================================== | ||
26 | --- qemu-2.5.0.orig/net/checksum.c | ||
27 | +++ qemu-2.5.0/net/checksum.c | ||
28 | @@ -59,6 +59,11 @@ void net_checksum_calculate(uint8_t *dat | ||
29 | int hlen, plen, proto, csum_offset; | ||
30 | uint16_t csum; | ||
31 | |||
32 | + /* Ensure data has complete L2 & L3 headers. */ | ||
33 | + if (length < 14 + 20) { | ||
34 | + return; | ||
35 | + } | ||
36 | + | ||
37 | if ((data[14] & 0xf0) != 0x40) | ||
38 | return; /* not IPv4 */ | ||
39 | hlen = (data[14] & 0x0f) * 4; | ||
40 | @@ -76,8 +81,9 @@ void net_checksum_calculate(uint8_t *dat | ||
41 | return; | ||
42 | } | ||
43 | |||
44 | - if (plen < csum_offset+2) | ||
45 | - return; | ||
46 | + if (plen < csum_offset + 2 || 14 + hlen + plen > length) { | ||
47 | + return; | ||
48 | + } | ||
49 | |||
50 | data[14+hlen+csum_offset] = 0; | ||
51 | data[14+hlen+csum_offset+1] = 0; | ||