diff options
author | Tom Rini <trini@konsulko.com> | 2022-10-07 11:51:05 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-10-07 11:51:05 -0400 |
commit | 11ef7f07ce60b60fb78c330b3ae35fd1037e50c1 (patch) | |
tree | fbbc12ec51fc3651d5fce002ebf38c76621dac8e /drivers/core/regmap.c | |
parent | f5717231abad983b4d8f87db612ae60dec86cb1b (diff) | |
parent | a75e8355eaa561ebd6128c92a90288d5d7c1f060 (diff) |
Merge tag 'efi-2023-01-rc1' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2023-01-rc1
UEFI:
* Provide driver binding protocol to registered events for block devices
* Code simplification and refactoring
* Fix pylint errors in test_efi_secboot
Other:
* Improve checks for register ranges
Diffstat (limited to 'drivers/core/regmap.c')
-rw-r--r-- | drivers/core/regmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c index 5f98f85cfc..5ccbf9abb8 100644 --- a/drivers/core/regmap.c +++ b/drivers/core/regmap.c @@ -399,7 +399,7 @@ int regmap_raw_read_range(struct regmap *map, uint range_num, uint offset, range = &map->ranges[range_num]; offset <<= map->reg_offset_shift; - if (offset + val_len > range->size) { + if (offset + val_len > range->size || offset + val_len < offset) { debug("%s: offset/size combination invalid\n", __func__); return -ERANGE; } @@ -538,7 +538,7 @@ int regmap_raw_write_range(struct regmap *map, uint range_num, uint offset, range = &map->ranges[range_num]; offset <<= map->reg_offset_shift; - if (offset + val_len > range->size) { + if (offset + val_len > range->size || offset + val_len < offset) { debug("%s: offset/size combination invalid\n", __func__); return -ERANGE; } |