Commit 6ee68773 authored Mar 13, 2018 by Andrew Morton Committed by Doug Ledford Mar 14, 2018

drivers/infiniband/core/verbs.c: fix build with gcc-4.4.4



gcc-4.4.4 has issues with initialization of anonymous unions.

drivers/infiniband/core/verbs.c: In function '__ib_drain_sq':
drivers/infiniband/core/verbs.c:2204: error: unknown field 'wr_cqe' specified in initializer
drivers/infiniband/core/verbs.c:2204: warning: initialization makes integer from pointer without a cast

Work around this.

Fixes: a1ae7d03 ("RDMA/core: Avoid that ib_drain_qp() triggers an out-of-bounds stack access")
Cc: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Steve Wise <swise@opengridcomputing.com>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

parent 43c9fc50

drivers/infiniband/core/verbs.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2196,8 +2196,9 @@ static void __ib_drain_sq(struct ib_qp *qp)
		struct ib_send_wr *bad_swr;
		struct ib_rdma_wr swr = {
		.wr = {
		.next = NULL,
		{ .wr_cqe = &sdrain.cqe, },
		.opcode = IB_WR_RDMA_WRITE,
		.wr_cqe = &sdrain.cqe,
		},
		};
		int ret;

Admin message