From: Maxime Coquelin Date: Tue, 16 Jun 2015 11:53:19 +0000 (+0200) Subject: regmap: Fix possible shift overflow in regmap_field_init() X-Git-Tag: v3.12.45~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=190747f7a31232706b31869d631891adfe8308dc;p=thirdparty%2Fkernel%2Fstable.git regmap: Fix possible shift overflow in regmap_field_init() commit 921cc29473a0d7c109105c1876ddb432f4a4be7d upstream. The way the mask is generated in regmap_field_init() is wrong. Indeed, a field initialized with msb = 31 and lsb = 0 provokes a shift overflow while calculating the mask field. On some 32 bits architectures, such as x86, the generated mask is 0, instead of the expected 0xffffffff. This patch uses GENMASK() to fix the problem, as this macro is already safe regarding shift overflow. [-js: in 3.12, we do not have GENMASK for general access. Define locally as RM_GENMASK.] Signed-off-by: Maxime Coquelin Signed-off-by: Mark Brown Signed-off-by: Jiri Slaby --- diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 45aec73d09bd3..8ece0fe4033f8 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -813,14 +813,16 @@ struct regmap *devm_regmap_init(struct device *dev, } EXPORT_SYMBOL_GPL(devm_regmap_init); +#define RM_GENMASK(h, l) \ + (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) + static void regmap_field_init(struct regmap_field *rm_field, struct regmap *regmap, struct reg_field reg_field) { - int field_bits = reg_field.msb - reg_field.lsb + 1; rm_field->regmap = regmap; rm_field->reg = reg_field.reg; rm_field->shift = reg_field.lsb; - rm_field->mask = ((BIT(field_bits) - 1) << reg_field.lsb); + rm_field->mask = RM_GENMASK(reg_field.msb, reg_field.lsb); } /**