Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

regmap: spi: Reserve space for register address/padding

Currently the max_raw_read and max_raw_write limits in regmap_spi struct
do not take into account the additional size of the transmitted register
address and padding. This may result in exceeding the maximum permitted
SPI message size, which could cause undefined behaviour, e.g. data
corruption.

Fix regmap_get_spi_bus() to properly adjust the above mentioned limits
by reserving space for the register address/padding as set in the regmap
configuration.

Fixes: f231ff38b7b2 ("regmap: spi: Set regmap max raw r/w from max_transfer_size")

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Lucas Tanure <tanureal@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220818104851.429479-1-cristian.ciocaltea@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Cristian Ciocaltea and committed by
Mark Brown
f5723cfc 568035b0

+8
+8
drivers/base/regmap/regmap-spi.c
··· 113 113 const struct regmap_config *config) 114 114 { 115 115 size_t max_size = spi_max_transfer_size(spi); 116 + size_t max_msg_size, reg_reserve_size; 116 117 struct regmap_bus *bus; 117 118 118 119 if (max_size != SIZE_MAX) { ··· 121 120 if (!bus) 122 121 return ERR_PTR(-ENOMEM); 123 122 123 + max_msg_size = spi_max_message_size(spi); 124 + reg_reserve_size = config->reg_bits / BITS_PER_BYTE 125 + + config->pad_bits / BITS_PER_BYTE; 126 + if (max_size + reg_reserve_size > max_msg_size) 127 + max_size -= reg_reserve_size; 128 + 124 129 bus->free_on_exit = true; 125 130 bus->max_raw_read = max_size; 126 131 bus->max_raw_write = max_size; 132 + 127 133 return bus; 128 134 } 129 135