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

regmap: spi: Fix potential off-by-one when calculating reserved size

If we ever meet a hardware that uses weird register bits and padding,
we may end up in off-by-one error since x/8 + y/8 might not be equal
to (x + y)/8 in some cases.

bits pad x/8+y/8 (x+y)/8
4..7 0..3 0 0 // x + y from 4 up to 7
4..7 4..7 0 1 // x + y from 8 up to 11
4..7 8..11 1 1 // x + y from 12 up to 15
8..15 0..7 1 1 // x + y from 8 up to 15
8..15 8..15 2 2 // x + y from 16 up to 23

Fix this by using (x+y)/8.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://msgid.link/r/20240605205315.19132-1-andy.shevchenko@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Andy Shevchenko and committed by
Mark Brown
d4ea1d50 3b0d6a32

+1 -2
+1 -2
drivers/base/regmap/regmap-spi.c
··· 122 122 return ERR_PTR(-ENOMEM); 123 123 124 124 max_msg_size = spi_max_message_size(spi); 125 - reg_reserve_size = config->reg_bits / BITS_PER_BYTE 126 - + config->pad_bits / BITS_PER_BYTE; 125 + reg_reserve_size = (config->reg_bits + config->pad_bits) / BITS_PER_BYTE; 127 126 if (max_size + reg_reserve_size > max_msg_size) 128 127 max_size -= reg_reserve_size; 129 128