michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: i2c_nrfx_twim: correct concat buf bounds check

Browse source 
The original checked only the current message length against the
buffer size, not accounting for space already used.

Also improve the diagnostic to indicate how much space is required vs
given.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2020-08-19 12:57:45 -05:00 • committed by Maureen Helm
commit d719801d1e
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/i2c/i2c_nrfx_twim.c
View file

@ -75,8 +75,9 @@ static int i2c_nrfx_twim_transfer(struct device *dev, struct i2c_msg *msgs,
!= (msgs[i].flags & I2C_MSG_READ)));
if ((concat_len != 0) || !last_or_non_concatenable) {
if (msgs[i].len > concat_buf_size) {
LOG_ERR("Concatenation buffer is too small");
if ((concat_len + msgs[i].len) > concat_buf_size) {
LOG_ERR("concat-buf overflow: %u + %u > %u",
concat_len, msgs[i].len, concat_buf_size);
return -ENOSPC;
}
if (!(msgs[i].flags & I2C_MSG_READ)) {