diff options
| author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2019-06-07 21:48:45 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-10 17:42:09 +0300 |
| commit | aef9752274f4045b0dab577e113da63c96832f77 (patch) | |
| tree | 0297f0e09f5208eaf4869ca72f0ffcc3bf1b10bc /drivers/spi/spi.c | |
| parent | 3e582c6e911ffe6c90b9f90324bdf85fc728d0c3 (diff) | |
| download | linux-aef9752274f4045b0dab577e113da63c96832f77.tar.xz | |
spi: Use struct_size() helper
One of the more common cases of allocation size calculations is finding
the size of a structure that has a zero-sized array at the end, along
with memory for some number of elements for that array. For example:
struct spi_replaced_transfers {
...
struct spi_transfer inserted_transfers[];
};
Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes.
So, replace the following form:
insert * sizeof(struct spi_transfer) + sizeof(struct spi_replaced_transfers)
with:
struct_size(rxfer, inserted_transfers, insert)
This code was detected with the help of Coccinelle.
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 232ed4bb8fca..bced6876de79 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2750,8 +2750,7 @@ struct spi_replaced_transfers *spi_replace_transfers( /* allocate the structure using spi_res */ rxfer = spi_res_alloc(msg->spi, __spi_replace_transfers_release, - insert * sizeof(struct spi_transfer) - + sizeof(struct spi_replaced_transfers) + struct_size(rxfer, inserted_transfers, insert) + extradatasize, gfp); if (!rxfer) |