aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2019-03-20 09:16:19 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-20 15:25:55 +0000
commita6882408f5c63d2434d5c1622406c2c212c9bec7 (patch)
tree2767b2d6fa4b89410307f950330ac96625aff9ab /meta
parent619a8ab875ee8e2914cd58947f342808d817833c (diff)
downloadopenembedded-core-contrib-a6882408f5c63d2434d5c1622406c2c212c9bec7.tar.gz
openembedded-core-contrib-a6882408f5c63d2434d5c1622406c2c212c9bec7.tar.bz2
openembedded-core-contrib-a6882408f5c63d2434d5c1622406c2c212c9bec7.zip
qemu: Fix "backport patches to fix cves" patch issue
This change fixes a build problem introduced in the recent CVE patches. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/qemu/qemu/0015-fix-CVE-2018-20124.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0015-fix-CVE-2018-20124.patch b/meta/recipes-devtools/qemu/qemu/0015-fix-CVE-2018-20124.patch
index ad846958a7..985b819409 100644
--- a/meta/recipes-devtools/qemu/qemu/0015-fix-CVE-2018-20124.patch
+++ b/meta/recipes-devtools/qemu/qemu/0015-fix-CVE-2018-20124.patch
@@ -38,7 +38,7 @@ index d7a4bbd9..7f8028f8 100644
- comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_NO_SGE, ctx);
+ if (!num_sge || num_sge > MAX_SGE) {
+ pr_dbg("invalid num_sge=%d\n", num_sge);
-+ comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_INV_NUM_SGE, ctx);
++ comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_NO_SGE, ctx);
return;
}
@@ -51,7 +51,7 @@ index d7a4bbd9..7f8028f8 100644
- comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_NO_SGE, ctx);
+ if (!num_sge || num_sge > MAX_SGE) {
+ pr_dbg("invalid num_sge=%d\n", num_sge);
-+ comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_INV_NUM_SGE, ctx);
++ comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_NO_SGE, ctx);
return;
}