wimax/i2400m: use struct_size() helper
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Wed, 1 May 2019 03:27:32 +0000 (22:27 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sat, 4 May 2019 04:04:31 +0000 (00:04 -0400)
Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes, in particular in the
context in which this code is being used.

So, replace code of the following form:

sizeof(*tx_msg) + le16_to_cpu(tx_msg->num_pls) * sizeof(tx_msg->pld[0]);

with:

struct_size(tx_msg, pld, le16_to_cpu(tx_msg->num_pls));

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wimax/i2400m/tx.c

index f20886ade1ccdf3147253e90f397263066eab431..ebd64e0837264bb9636bed91f58e6809edbaad47 100644 (file)
@@ -640,8 +640,7 @@ void i2400m_tx_close(struct i2400m *i2400m)
         * figure out where the next TX message starts (and where the
         * offset to the moved header is).
         */
-       hdr_size = sizeof(*tx_msg)
-               + le16_to_cpu(tx_msg->num_pls) * sizeof(tx_msg->pld[0]);
+       hdr_size = struct_size(tx_msg, pld, le16_to_cpu(tx_msg->num_pls));
        hdr_size = ALIGN(hdr_size, I2400M_PL_ALIGN);
        tx_msg->offset = I2400M_TX_PLD_SIZE - hdr_size;
        tx_msg_moved = (void *) tx_msg + tx_msg->offset;