drivers/infiniband/ulp/srpt/ib_srpt.c: fix build with gcc-4.4.4

PATCH New [email protected] 1 participant 1 message Mar 13, 2018

Subsystems (3)

Stable branch InfiniBand SCSI RDMA protocol (SRP) target

lore

Share & tools

lore

[email protected]

author

2018-03-13 22:06 UTC #0 lore raw

PATCH 1/1 drivers/infiniband/ulp/srpt/ib_srpt.c: fix build with gcc-4.4.4

From: Andrew Morton <[email protected]>
Subject: drivers/infiniband/ulp/srpt/ib_srpt.c: fix build with gcc-4.4.4

gcc-4.4.4 has issues with initialization of anonymous unions:

drivers/infiniband/ulp/srpt/ib_srpt.c: In function 'srpt_zerolength_write':
drivers/infiniband/ulp/srpt/ib_srpt.c:854: error: unknown field 'wr_cqe' specified in initializer drivers/infiniband/ulp/srpt/ib_srpt.c:854: warning: initialization makes integer from pointer without a cast

Work aound this.

Fixes 2a78cb4db487 ("IB/srpt: Fix an out-of-bounds stack access in srpt_zerolength_write()")

Cc Bart Van Assche <[email protected]>

Cc Christoph Hellwig <[email protected]>

Cc Jason Gunthorpe <[email protected]>

Cc <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 drivers/infiniband/ulp/srpt/ib_srpt.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/infiniband/ulp/srpt/ib_srpt.c renamed from drivers/infiniband/ulp/srpt/ib_srpt.c~drivers-infiniband-ulp-srpt-ib_srptc-fix-build-with-gcc-444 +2 -1

diff -puN drivers/infiniband/ulp/srpt/ib_srpt.c~drivers-infiniband-ulp-srpt-ib_srptc-fix-build-with-gcc-444 drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -850,8 +850,9 @@ static int srpt_zerolength_write(struct
 	struct ib_send_wr *bad_wr;
 	struct ib_rdma_wr wr = {
 		.wr = {
+			.next		= NULL,
+			{ .wr_cqe	= &ch->zw_cqe, },
 			.opcode		= IB_WR_RDMA_WRITE,
-			.wr_cqe		= &ch->zw_cqe,
 			.send_flags	= IB_SEND_SIGNALED,
 		}
 	};