net/smc: use a constant for control message length

Karsten Graul · davem330 · commit cbba07a726fb · 2018-02-28T12:30:25.000-05:00
The sizeof(struct smc_cdc_msg) evaluates to 48 bytes instead of the
required 44 bytes. We need to use the constant value of
SMC_WR_TX_SIZE to set and check the control message length.

Signed-off-by: Karsten Graul &lt;kgraul@linux.vnet.ibm.com&gt;
Signed-off-by: Ursula Braun &lt;ubraun@linux.vnet.ibm.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/smc/smc_cdc.c b/net/smc/smc_cdc.c
@@ -269,7 +269,7 @@ static void smc_cdc_rx_handler(struct ib_wc *wc, void *buf)
 
 	if (wc->byte_len < offsetof(struct smc_cdc_msg, reserved))
 		return; /* short message */
-	if (cdc->len != sizeof(*cdc))
+	if (cdc->len != SMC_WR_TX_SIZE)
 		return; /* invalid message */
 	smc_cdc_msg_recv(cdc, link, wc->wr_id);
 }
diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
@@ -465,7 +465,7 @@ int smc_conn_create(struct smc_sock *smc, __be32 peer_in_addr,
 		rc = smc_link_determine_gid(conn->lgr);
 	}
 	conn->local_tx_ctrl.common.type = SMC_CDC_MSG_TYPE;
-	conn->local_tx_ctrl.len = sizeof(struct smc_cdc_msg);
+	conn->local_tx_ctrl.len = SMC_WR_TX_SIZE;
 #ifndef KERNEL_HAS_ATOMIC64
 	spin_lock_init(&conn->acurs_lock);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ static void smc_cdc_rx_handler(struct ib_wc wc, void buf)`
`269`	`269`
`270`	`270`	`if (wc->byte_len < offsetof(struct smc_cdc_msg, reserved))`
`271`	`271`	`return; /* short message */`
`272`		`- if (cdc->len != sizeof(*cdc))`
	`272`	`+ if (cdc->len != SMC_WR_TX_SIZE)`
`273`	`273`	`return; /* invalid message */`
`274`	`274`	`smc_cdc_msg_recv(cdc, link, wc->wr_id);`
`275`	`275`	`}`
Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ int smc_conn_create(struct smc_sock *smc, __be32 peer_in_addr,`
`465`	`465`	`rc = smc_link_determine_gid(conn->lgr);`
`466`	`466`	`}`
`467`	`467`	`conn->local_tx_ctrl.common.type = SMC_CDC_MSG_TYPE;`
`468`		`- conn->local_tx_ctrl.len = sizeof(struct smc_cdc_msg);`
	`468`	`+ conn->local_tx_ctrl.len = SMC_WR_TX_SIZE;`
`469`	`469`	`#ifndef KERNEL_HAS_ATOMIC64`
`470`	`470`	`spin_lock_init(&conn->acurs_lock);`
`471`	`471`	`#endif`