From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 22 Mar 2018 20:43:57 +0000 (+0100)
Subject: fix up 4.14.y patch to build
X-Git-Tag: v3.18.102~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a4d9a9a5de3efef677be8ed34a923118ce562ac;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up 4.14.y patch to build
---

diff --git a/queue-4.14/ib-mlx5-fix-out-of-bounds-read-in-create_raw_packet_qp_rq.patch b/queue-4.14/ib-mlx5-fix-out-of-bounds-read-in-create_raw_packet_qp_rq.patch
index a02a6f1a80e..02aea9693f4 100644
--- a/queue-4.14/ib-mlx5-fix-out-of-bounds-read-in-create_raw_packet_qp_rq.patch
+++ b/queue-4.14/ib-mlx5-fix-out-of-bounds-read-in-create_raw_packet_qp_rq.patch
@@ -122,8 +122,8 @@ Signed-off-by: Doug Ledford <dledford@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- drivers/infiniband/hw/mlx5/qp.c |   23 ++++++++++++++++-------
- 1 file changed, 16 insertions(+), 7 deletions(-)
+ drivers/infiniband/hw/mlx5/qp.c |   24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
 
 --- a/drivers/infiniband/hw/mlx5/qp.c
 +++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -197,3 +197,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	} else {
  		err = mlx5_core_create_qp(dev->mdev, &base->mqp, in, inlen);
  	}
+@@ -1825,6 +1834,7 @@ err_create:
+ 	else if (qp->create_type == MLX5_QP_KERNEL)
+ 		destroy_qp_kernel(dev, qp);
+ 
++err:
+ 	kvfree(in);
+ 	return err;
+ }