regmap: Fix reversed bounds check in regmap_raw_write()
Subsystems (4)
PATCH 1/2 regmap: Fix reversed bounds check in regmap_raw_write()
We're supposed to be checking that "val_len" is not too large but instead we check if it is smaller than the max.
The only function affected would be regmap_i2c_smbus_i2c_write() in drivers/base/regmap/regmap-i2c.c. Strangely that function has its own limit check which returns an error if (count >= I2C_SMBUS_BLOCK_MAX) so it doesn't look like it has ever been able to do anything except return an error.
---
This is from code review. I can't test it.
Is it possible that there are other ways to reach regmap_i2c_smbus_i2c_write() without going through regmap_raw_write()? In that case, the temptation would be to just remove this check and the one in regmap_raw_read().
drivers/base/regmap/regmap.c +1 -1
@@ -1831,7 +1831,7 @@ int regmap_raw_write(struct regmap *map, unsigned int reg,return -EINVAL ;if (val_len % map->format.val_bytes)return -EINVAL ; -if (map->max_raw_write && map->max_raw_write > val_len) +if (map->max_raw_write && map->max_raw_write < val_len)return -E2BIG ; map->lock (map->lock_arg);
PATCH 2/2 regmap-i2c: Off by one in regmap_i2c_smbus_i2c_read/write()
The commit message says that we are allowed to read and write up to 32 bytes but the code only allows us to write 31 bytes. In other words, the ">=" should be changed to ">". But this is already checked in regmap_raw_read()/write() so we can just remove the if statemetents.
---
Not tested.
drivers/base/regmap/regmap-i2c.c +0 -4
@@ -217,8 +217,6 @@ static int regmap_i2c_smbus_i2c_write(void *context, const void *data,if (count <1 )return -EINVAL ; -if (count >=I2C_SMBUS_BLOCK_MAX ) -return -E2BIG ; --count; return i2c_smbus_write_i2c_block_data(i2c, ((u8 *)data)[0], count,
@@ -235,8 +233,6 @@ static int regmap_i2c_smbus_i2c_read(void *context, const void *reg,if (reg_size !=1 || val_size <1 )return -EINVAL ; -if (val_size >=I2C_SMBUS_BLOCK_MAX ) -return -E2BIG ; ret =i2c_smbus_read_i2c_block_data (i2c, ((u8 *)reg)[0 ], val_size, val);if (ret = val_size)
Mark Brown
maintainerApplied "regmap-i2c: Off by one in regmap_i2c_smbus_i2c_read/write()" to the regmap tree
The patch
regmap-i2c: Off by one in regmap_i2c_smbus_i2c_read/write()
has been applied to the regmap tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
From 86effbe0d198aaf57459ec9ad3855e88e29ecb1c Mon Sep 17 00:00:00 2001
From: Dan Carpenter <[email protected]>
Date: Thu, 8 Feb 2018 10:25:28 +0300
Subject: [PATCH] regmap-i2c: Off by one in regmap_i2c_smbus_i2c_read/write()
The commit message says that we are allowed to read and write up to 32 bytes but the code only allows us to write 31 bytes. In other words, the ">=" should be changed to ">". But this is already checked in regmap_raw_read()/write() so we can just remove the if statemetents.
--- drivers/base/regmap/regmap-i2c.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/base/regmap/regmap-i2c.c +0 -4
@@ -217,8 +217,6 @@ static int regmap_i2c_smbus_i2c_write(void *context, const void *data,if (count <1 )return -EINVAL ; -if (count >=I2C_SMBUS_BLOCK_MAX ) -return -E2BIG ; --count; return i2c_smbus_write_i2c_block_data(i2c, ((u8 *)data)[0], count,
@@ -235,8 +233,6 @@ static int regmap_i2c_smbus_i2c_read(void *context, const void *reg,if (reg_size !=1 || val_size <1 )return -EINVAL ; -if (val_size >=I2C_SMBUS_BLOCK_MAX ) -return -E2BIG ; ret =i2c_smbus_read_i2c_block_data (i2c, ((u8 *)reg)[0 ], val_size, val);if (ret = val_size)
Signature · 1 line
2.15.1
Mark Brown
maintainerApplied "regmap: Fix reversed bounds check in regmap_raw_write()" to the regmap tree
In reply to Dan CarpenterThe patch
regmap: Fix reversed bounds check in regmap_raw_write()
has been applied to the regmap tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
From f00e71091ab92eba52122332586c6ecaa9cd1a56 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <[email protected]>
Date: Thu, 8 Feb 2018 10:23:44 +0300
Subject: [PATCH] regmap: Fix reversed bounds check in regmap_raw_write()
We're supposed to be checking that "val_len" is not too large but instead we check if it is smaller than the max.
The only function affected would be regmap_i2c_smbus_i2c_write() in drivers/base/regmap/regmap-i2c.c. Strangely that function has its own limit check which returns an error if (count >= I2C_SMBUS_BLOCK_MAX) so it doesn't look like it has ever been able to do anything except return an error.
--- drivers/base/regmap/regmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/regmap/regmap.c +1 -1
@@ -1831,7 +1831,7 @@ int regmap_raw_write(struct regmap *map, unsigned int reg,return -EINVAL ;if (val_len % map->format.val_bytes)return -EINVAL ; -if (map->max_raw_write && map->max_raw_write > val_len) +if (map->max_raw_write && map->max_raw_write < val_len)return -E2BIG ; map->lock (map->lock_arg);
Signature · 1 line
2.15.1