Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33825761 authored by Karsten Graul's avatar Karsten Graul Committed by David S. Miller
Browse files

net/smc: fix structure size 



The struct smc_cdc_msg must be defined as packed so the
size is 44 bytes.
And change the structure size check so sizeof is checked.

Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 51dce24b

net/smc/smc_cdc.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static inline void smc_cdc_add_pending_send(struct smc_connection *conn, 
		sizeof(struct smc_cdc_msg) > SMC_WR_BUF_SIZE,

		"must increase SMC_WR_BUF_SIZE to at least sizeof(struct smc_cdc_msg)");

	BUILD_BUG_ON_MSG(

		offsetof(struct smc_cdc_msg, reserved) > SMC_WR_TX_SIZE,

		sizeof(struct smc_cdc_msg) != SMC_WR_TX_SIZE,

		"must adapt SMC_WR_TX_SIZE to sizeof(struct smc_cdc_msg); if not all smc_wr upper layer protocols use the same message size any more, must start to set link->wr_tx_sges[i].length on each individual smc_wr_tx_send()");

	BUILD_BUG_ON_MSG(

		sizeof(struct smc_cdc_tx_pend) > SMC_WR_TX_PEND_PRIV_SIZE,

net/smc/smc_cdc.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct smc_cdc_msg { 
	struct smc_cdc_producer_flags	prod_flags;

	struct smc_cdc_conn_state_flags	conn_state_flags;

	u8				reserved[18];

} __aligned(8);

} __packed;					/* format defined in RFC7609 */



static inline bool smc_cdc_rxed_any_close(struct smc_connection *conn)

{