110 Commits

Author SHA1 Message Date
AlexChen
06f886beec qemu: rename some patches for slirp
Signed-off-by: AlexChen <alex.chen@huawei.com>
2020-10-10 15:42:27 +08:00
AlexChen
a7b090aaca qemu: enrich commit info for some patchs
Signed-off-by: AlexChen <alex.chen@huawei.com>
2020-10-10 15:41:56 +08:00
Jiajie Li
74e366ee0f Fix CVE-2020-25085 & CVE-2020-25084
Signed-off-by Jiajie Li <lijiajie11@huawei.com>
2020-10-10 15:41:09 +08:00
Jiajie Li
3b04b46775 Drop bogus IPv6 messages
Drop IPv6 message shorter than what's mentioned in the payload
  length header (+ the size of the IPv6 header). They're invalid and could
  lead to data leakage in icmp6_send_echoreply().
2020-10-10 15:40:02 +08:00
openeuler-ci-bot
cce9e18917 !88 fix hw/usb/core.c fix buffer overflow in do_token_setup
Merge pull request !88 from lijiajie128/openEuler-20.03-LTS
2020-08-27 21:06:22 +08:00
lijiajie
514ab9213b update qemu.spec with hw-usb-core-fix-overflow.patch 2020-08-27 20:43:36 +08:00
lijiajie
22b067020e hw/usb/core.c fix buffer overflow in do_token_setup() function
Store calculated setup_len in a local variable, verify it, and only
write it to the struct(USBDevice->setup_len)in case it passed the
sanity checks.

This prevent other code (do_token_{in,out}function specifically)
from working with invalid USBDevice->setup_len values and overruning
the USBDevice->setup_buf[] buffer.

Fixes: CVE-2020-14364
2020-08-27 20:34:42 +08:00
openeuler-ci-bot
e6824283ca !74 hw/arm/acpi: enable SHPC native hot plug
Merge pull request !74 from 金泽宇/openEuler-20.03-LTS
2020-08-13 09:54:08 +08:00
Zeyu Jin
2bfc4806b3 hw/arm/acpi: enable SHPC native hot plug
backport from upstream:
https://git.qemu.org/?p=qemu.git;a=commit;h=e04c13cdcf5befd9d08df38d4d34494a802cdf63

Signed-off-by: Zeyu Jin <jinzeyu@huawei.com>
2020-08-12 14:14:30 +08:00
openeuler-ci-bot
00d4a81e22 !69 LTS分支增加qemu.spec rdb支持
Merge pull request !69 from 金泽宇/openEuler-20.03-LTS
2020-08-12 09:31:40 +08:00
Zeyu Jin
b7af38f23a spec: increase build-requirement of rbd-devel
Rbd support is default in qemu configure, so we should also add rbd support in qemu.spec .

Signed-off-by: jinzeyu <jinzeyu@huawei.com>
2020-08-11 20:47:23 +08:00
openeuler-ci-bot
c80e7e61dc !61 Enable werror for qemu and fix a building warning
Merge pull request !61 from FangYing/openEuler-20.03-LTS
2020-08-04 17:38:23 +08:00
Ying Fang
b2456150ba spec: enable Werror by default
enable Werror by default so that we can check compilation warnnings

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-08-04 15:30:36 +08:00
Ying Fang
8583518dca migration: add missing ram.h for migration/socket.c
ram.h is missing for migration/socket.c, let's add it.
Later we will enable werror for qemu.spec

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-08-04 15:12:22 +08:00
openeuler-ci-bot
7e5fd29f2c !59 [bugfix] pick several patches from upstream that fix CVE
Merge pull request !59 from zhanghailiang/openEuler-20.03-LTS
2020-07-29 17:05:08 +08:00
zhanghailiang
82b842349a qemu: pick serveral patches from upstream that fix CVE
Fix CVE-2020-13361, CVE-2020-13659, CVE-2020-13800, CVE-2020-13362

Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
2020-07-25 13:25:59 +08:00
openeuler-ci-bot
f55df4e982 !56 [bugfix] fix two patches format and one CVE bug
Merge pull request !56 from zhanghailiang/openEuler-20.03-LTS
2020-06-20 17:12:02 +08:00
zhanghailiang
a8e410c7ce spec: increase release number
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
2020-06-20 15:42:02 +08:00
zhanghailiang
7a630f65f1 target/arm: Fix PAuth sbox functions
Fix CVE-2020-10702 bug

Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
2020-06-20 15:41:47 +08:00
zhanghailiang
aa9682be92 patch: fix patch format problem which can lead git am failed
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
2020-06-20 15:41:33 +08:00
openeuler-ci-bot
65a86d3003 !52 Add kvm_adjvtimer vcpu property for Cortex-A72
Merge pull request !52 from FangYing/openEuler-20.03-LTS
2020-05-29 14:08:03 +08:00
Ying Fang
dcba4d91a4 spec: Update release version
increase release version by one

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-29 11:16:19 +08:00
Ying Fang
12087330c1 target/arm: Add the kvm_adjvtime vcpu property for Cortex-A72
Add the kvm_adjvtime vcpu property for ARM Cortex-A72 cpu model,
so that virtual time adjust will be enabled for it.

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-29 11:15:45 +08:00
Ying Fang
cdc4c75a8b Revert "target/arm: add ths missing GENERIC_TIMER"
This reverts commit 665d6b61fd86629272885e281410f512f8e7f32e.
2020-05-29 11:09:01 +08:00
XuYandong
ae7185c91d !51 [bugfix] add missing GENERIC_TIMER for cpu64
Merge pull request !51 from zhanghailiang/openEuler-20.03-LTS
2020-05-28 21:10:40 +08:00
zhanghailiang
665d6b61fd target/arm: add ths missing GENERIC_TIMER
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
2020-05-28 20:19:41 +08:00
openeuler-ci-bot
0f9eaf7ed5 !48 Drop vtimer virutal time adjust
Merge pull request !48 from FangYing/openEuler-20.03-LTS
2020-05-27 21:51:18 +08:00
Ying Fang
863c2d9a26 spec: Update release version
increase release verison by one

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-27 17:55:44 +08:00
Ying Fang
79484a725d vtimer: Drop vtimer virtual timer adjust
This patch drops the vtimer virtual timer adjust, cross version migration
from openEuler qemu-4.0.1 to qemu-4.1.0 is not supported as a consequence.

By default openEuler qemu-4.1.0 use kvm_adjvtime as the virtual timer.

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-27 17:54:00 +08:00
openeuler-ci-bot
3e65b9f2c0 !47 Compat vtimer for openEuler qemu v4.0.1 and v4.1.0
Merge pull request !47 from FangYing/openEuler-20.03-LTS
2020-05-27 12:56:19 +08:00
Ying Fang
56680863f3 spec: Update release version
increase release version by one

Signed-off-by: Ying Fang <fanging1@huawei.com>
2020-05-27 12:14:35 +08:00
Ying Fang
1461981236 migration: Compat virtual timer adjust for v4.0.1 and v4.1.0
Vtimer adjust is used in openEuler qemu-4.0.1, however kvm_adjvtime
is introduced in openEuler qemu-4.1.0. To maintain the compatibility
and enable cross version migration, let's enable vtimer adjust only
if kvm_adjvtime is not enabled, otherwise there may be conflicts
between vtimer adjust and kvm_adjvtime.

After this modification:
1: openEuler qemu-4.0.1 use vtimer as the default virtual timer
2: openEuler qemu-4.1.0 use kvm_adjvtime as the defaut virtual timer

Migration from openEuler qemu-4.0.1 to openEuler qemu-4.1.0 will
be ok, but migration path from upstream qemu-4.0.1 to openEuler
qemu-4..0.1 will be broken.

Since openEuler qemu-4.1.0, kvm_adjvtime is used as the default
virtual timer. So please upgrade to openEuler qemu-4.1.0 and
use the virt-4.1 machine.

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-27 12:13:58 +08:00
Ying Fang
892f646185 hw/arm/virt: add missing compat for kvm-no-adjvtime
Machine compatibility for kvm-no-adjvtime is missed,
let's add it for virt machine 4.0, thus kvm-no-adjvtime
is supported in v4.1.0.

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-27 12:13:48 +08:00
Ying Fang
1001a58940 vtimer: introduce the vtimer first used in v4.0.1
To support cross version migration, we had to add the vtimer back
which was introduced in openEuler qemu-4.0.1.

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-27 12:13:37 +08:00
Ying Fang
52e260612c Revert: "vtimer: compat cross version migration from v4.0.1"
This reverts commit patch:
vtimer-compat-cross-version-migration-from-v4.0.1.patch

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-27 12:13:17 +08:00
openeuler-ci-bot
40b5784387 !45 [feature] Add some debug log in VM runtime path
Merge pull request !45 from FangYing/openEuler-20.03-LTS
2020-05-25 21:07:29 +08:00
Ying Fang
9fc44209ab spec: Update release version
increase release version by one

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-22 19:27:25 +08:00
Ying Fang
30364c2a3e log: Add some logs on VM runtime path
Add logs on VM runtime path, to make it easier to do trouble shooting.

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-22 19:27:13 +08:00
openeuler-ci-bot
682a457d22 !43 fix CVE-2018-19665 and CVE-2019-15890
Merge pull request !43 from FangYing/openEuler-20.03-LTS
2020-05-22 14:03:17 +08:00
Leo Fang
26cae7937d CVE: Fix CVE-2018-19665
upstream url:
https://patchwork.kernel.org/patch/10688527/

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-22 12:29:21 +08:00
Ying Fang
ae206fbfdc CVE: Fix CVE-2019-15890
this patch fix CVE-2019-15890, upstream patch url:
https://gitlab.freedesktop.org/slirp/libslirp/commit/c5927943

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-22 12:27:56 +08:00
Ying Fang
6ca708e5c3 arm: drop redunt patch
Drop the redunt patch:
ARM-KVM-Check-KVM_CAP_ARM_IRQ_LINE_LAYOUT_2-for-smp_.patch

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-22 11:16:46 +08:00
openeuler-ci-bot
f19ebb0670 !42 Fix CVE-2020-7211
Merge pull request !42 from FangYing/openEuler-20.03-LTS
2020-05-15 17:49:19 +08:00
Ying Fang
4f814f3518 CVE: Fix CVE-2020-7211
backport from upstream:
14ec36e107

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-15 16:51:37 +08:00
openeuler-ci-bot
2a3c6ba49d !41 Fix CVE-2020-11869 and CVE-2019-20175
Merge pull request !41 from FangYing/openEuler-20.03-LTS
2020-05-15 16:30:51 +08:00
Ying Fang
e74fdc8bef spec: Update release version
increase release version by one

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-15 15:49:58 +08:00
Ying Fang
6fc286684c CVE: fix CVE-2020-11869
backport from qemu upstream:
https://git.qemu.org/?p=qemu.git;a=commit;h=ac2071c3791b67fc7af78b8ceb320c01ca1b5df7

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-15 15:47:11 +08:00
Ying Fang
ec1a227b48 CVE: fix CVE-2019-20175
backport patch from upstream:
https://git.qemu.org/?p=qemu.git;a=commitdiff;h=ed78352a59ea7acf7520d4d47a96b9911bae7fc3

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-15 15:33:14 +08:00
XuYandong
29e83277d4 !40 arm64 add cpu cold plug support
Merge pull request !40 from yorifang/openEuler-20.03-LTS
2020-05-12 19:05:38 +08:00
Ying Fang
dd9af1f5f4 spec: Update release version
increase release version by one

Signed-off-by: Ying Fang <fangying1@huawei.com>
2020-05-12 17:24:19 +08:00