releases/4.16.4/drivers-infiniband-core-verbs.c-fix-build-with-gcc-4.4.4.patch

   1 From 6ee687735e745eafae9e6b93d1ea70bc52e7ad07 Mon Sep 17 00:00:00 2001
   2 From: Andrew Morton <akpm@linux-foundation.org>
   3 Date: Tue, 13 Mar 2018 14:51:57 -0700
   4 Subject: drivers/infiniband/core/verbs.c: fix build with gcc-4.4.4
   5
   6 From: Andrew Morton <akpm@linux-foundation.org>
   7
   8 commit 6ee687735e745eafae9e6b93d1ea70bc52e7ad07 upstream.
   9
  10 gcc-4.4.4 has issues with initialization of anonymous unions.
  11
  12 drivers/infiniband/core/verbs.c: In function '__ib_drain_sq':
  13 drivers/infiniband/core/verbs.c:2204: error: unknown field 'wr_cqe' specified in initializer
  14 drivers/infiniband/core/verbs.c:2204: warning: initialization makes integer from pointer without a cast
  15
  16 Work around this.
  17
  18 Fixes: a1ae7d0345edd5 ("RDMA/core: Avoid that ib_drain_qp() triggers an out-of-bounds stack access")
  19 Cc: Bart Van Assche <bart.vanassche@wdc.com>
  20 Cc: Steve Wise <swise@opengridcomputing.com>
  21 Cc: Sagi Grimberg <sagi@grimberg.me>
  22 Cc: Jason Gunthorpe <jgg@mellanox.com>
  23 Cc: <stable@vger.kernel.org>
  24 Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  25 Signed-off-by: Doug Ledford <dledford@redhat.com>
  26 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  27
  28 ---
  29  drivers/infiniband/core/verbs.c |    3 ++-
  30  1 file changed, 2 insertions(+), 1 deletion(-)
  31
  32 --- a/drivers/infiniband/core/verbs.c
  33 +++ b/drivers/infiniband/core/verbs.c
  34 @@ -2197,8 +2197,9 @@ static void __ib_drain_sq(struct ib_qp *
  35         struct ib_send_wr *bad_swr;
  36         struct ib_rdma_wr swr = {
  37                 .wr = {
  38 +                       .next = NULL,
  39 +                       { .wr_cqe       = &sdrain.cqe, },
  40                         .opcode = IB_WR_RDMA_WRITE,
  41 -                       .wr_cqe = &sdrain.cqe,
  42                 },
  43         };
  44         int ret;