Skip to content

Commit

Permalink
regmap: fix kernel hang on regmap_bulk_write with zero val_count.
Browse files Browse the repository at this point in the history
If val_count is zero we return -EINVAL with map->lock_arg locked, which
will deadlock the kernel next time we try to acquire this lock.

In 3.12, this was introduced by a0b8d8d
("regmap: fix possible ZERO_SIZE_PTR pointer dereferencing error.")
which improperly back-ported d6b41cb.

This issue was found during review of Ubuntu Trusty 3.13.0-40.68 kernel to
prepare Ksplice rebootless updates.

Fixes: f5942dd ("regmap: fix possible ZERO_SIZE_PTR pointer dereferencing error.")
Signed-off-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
  • Loading branch information
Quentin Casasnovas authored and Jiri Slaby committed Nov 13, 2014
1 parent cb06484 commit a7a2830
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/base/regmap/regmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1403,8 +1403,10 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
if (val_bytes == 1) {
wval = (void *)val;
} else {
if (!val_count)
return -EINVAL;
if (!val_count) {
ret = -EINVAL;
goto out;
}

wval = kmemdup(val, val_count * val_bytes, GFP_KERNEL);
if (!wval) {
Expand Down

0 comments on commit a7a2830

Please sign in to comment.