Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'regmap-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull last minute regman bug fix from Mark Brown:
"This is a last minute bug fix that was only just noticed since the
code path that's being exercised here is one that is fairly rarely
used. The changelog for the change itself is extremely clear and the
code itself is obvious to inspection so should be pretty safe."
* tag 'regmap-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: fix possible memory corruption in regmap_bulk_read()
+3
-1
+3
-1
drivers/base/regmap/regmap.c
+3
-1
drivers/base/regmap/regmap.c
···
775
775
map->format.parse_val(val + i);
776
776
} else {
777
777
for (i = 0; i < val_count; i++) {
778
-
ret = regmap_read(map, reg + i, val + (i * val_bytes));
778
+
unsigned int ival;
779
+
ret = regmap_read(map, reg + i, &ival);
779
780
if (ret != 0)
780
781
return ret;
782
+
memcpy(val + (i * val_bytes), &ival, val_bytes);
781
783
}
782
784
}
783
785