From: Kai Kang <kai.kang@windriver.com>
Date: Wed, 20 Mar 2019 13:16:19 +0000 (-0400)
Subject: qemu: Fix "backport patches to fix cves" patch issue
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~15014
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6882408f5c63d2434d5c1622406c2c212c9bec7;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

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 ad846958a78..985b8194091 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;
      }