diff options
| author | Kai Kang <kai.kang@windriver.com> | 2019-03-20 09:16:19 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-21 16:19:23 +0000 |
| commit | 5061e7e9b547aee20b78d98bf219ef51ab3c45f8 (patch) | |
| tree | 9ced084b55db0685171bb94f959f0442df5821f5 | |
| parent | 753e2a0ede4449917c75353b57f13bbafe70fac8 (diff) | |
| download | poky-5061e7e9b547aee20b78d98bf219ef51ab3c45f8.tar.gz | |
qemu: Fix "backport patches to fix cves" patch issue
This change fixes a build problem introduced in the recent CVE patches.
(From OE-Core rev: a6882408f5c63d2434d5c1622406c2c212c9bec7)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu/0015-fix-CVE-2018-20124.patch | 4 |
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 | |||
| 38 | - comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_NO_SGE, ctx); | 38 | - comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_NO_SGE, ctx); |
| 39 | + if (!num_sge || num_sge > MAX_SGE) { | 39 | + if (!num_sge || num_sge > MAX_SGE) { |
| 40 | + pr_dbg("invalid num_sge=%d\n", num_sge); | 40 | + pr_dbg("invalid num_sge=%d\n", num_sge); |
| 41 | + comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_INV_NUM_SGE, ctx); | 41 | + comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_NO_SGE, ctx); |
| 42 | return; | 42 | return; |
| 43 | } | 43 | } |
| 44 | 44 | ||
| @@ -51,7 +51,7 @@ index d7a4bbd9..7f8028f8 100644 | |||
| 51 | - comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_NO_SGE, ctx); | 51 | - comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_NO_SGE, ctx); |
| 52 | + if (!num_sge || num_sge > MAX_SGE) { | 52 | + if (!num_sge || num_sge > MAX_SGE) { |
| 53 | + pr_dbg("invalid num_sge=%d\n", num_sge); | 53 | + pr_dbg("invalid num_sge=%d\n", num_sge); |
| 54 | + comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_INV_NUM_SGE, ctx); | 54 | + comp_handler(IBV_WC_GENERAL_ERR, VENDOR_ERR_NO_SGE, ctx); |
| 55 | return; | 55 | return; |
| 56 | } | 56 | } |
| 57 | 57 | ||