MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-23 07:23:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

leds: flash: leds-qcom-flash: Fix registry access after re-bind

Browse Source 
[ Upstream commit fab15f5736 ]

Driver in probe() updates each of 'reg_field' with 'reg_base':

	for (i = 0; i < REG_MAX_COUNT; i++)
		regs[i].reg += reg_base;

'reg_field' array (under variable 'regs' above) is statically allocated,
thus each re-bind would add another 'reg_base' leading to bogus
register addresses.  Constify the local 'reg_field' array and duplicate
it in probe to solve this.

Fixes: 96a2e242a5 ("leds: flash: Add driver to support flash LED module in QCOM PMICs")
Cc: stable@vger.kernel.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Fenglin Wu <fenglin.wu@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250529063335.8785-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Krzysztof Kozlowski 2025-08-15 15:31:27 -04:00 committed by Greg Kroah-Hartman
parent 71230248a7
commit c8a1e1f029
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/leds/flash/leds-qcom-flash.c
View File

@ -117,7 +117,7 @@ enum {
REG_MAX_COUNT, REG_MAX_COUNT,
}; };
static struct reg_field mvflash_3ch_regs[REG_MAX_COUNT] = { static const struct reg_field mvflash_3ch_regs[REG_MAX_COUNT] = {
REG_FIELD(0x08, 0, 7), /* status1 */ REG_FIELD(0x08, 0, 7), /* status1 */
REG_FIELD(0x09, 0, 7), /* status2 */ REG_FIELD(0x09, 0, 7), /* status2 */
REG_FIELD(0x0a, 0, 7), /* status3 */ REG_FIELD(0x0a, 0, 7), /* status3 */
@ -132,7 +132,7 @@ static struct reg_field mvflash_3ch_regs[REG_MAX_COUNT] = {
REG_FIELD(0x58, 0, 2), /* therm_thrsh3 */ REG_FIELD(0x58, 0, 2), /* therm_thrsh3 */
}; };
static struct reg_field mvflash_4ch_regs[REG_MAX_COUNT] = { static const struct reg_field mvflash_4ch_regs[REG_MAX_COUNT] = {
REG_FIELD(0x06, 0, 7), /* status1 */ REG_FIELD(0x06, 0, 7), /* status1 */
REG_FIELD(0x07, 0, 6), /* status2 */ REG_FIELD(0x07, 0, 6), /* status2 */
REG_FIELD(0x09, 0, 7), /* status3 */ REG_FIELD(0x09, 0, 7), /* status3 */
@ -855,11 +855,17 @@ static int qcom_flash_led_probe(struct platform_device *pdev)
if (val == FLASH_SUBTYPE_3CH_PM8150_VAL || val == FLASH_SUBTYPE_3CH_PMI8998_VAL) { if (val == FLASH_SUBTYPE_3CH_PM8150_VAL || val == FLASH_SUBTYPE_3CH_PMI8998_VAL) {
flash_data->hw_type = QCOM_MVFLASH_3CH; flash_data->hw_type = QCOM_MVFLASH_3CH;
flash_data->max_channels = 3; flash_data->max_channels = 3;
regs = mvflash_3ch_regs; regs = devm_kmemdup(dev, mvflash_3ch_regs, sizeof(mvflash_3ch_regs),
GFP_KERNEL);
if (!regs)
return -ENOMEM;
} else if (val == FLASH_SUBTYPE_4CH_VAL) { } else if (val == FLASH_SUBTYPE_4CH_VAL) {
flash_data->hw_type = QCOM_MVFLASH_4CH; flash_data->hw_type = QCOM_MVFLASH_4CH;
flash_data->max_channels = 4; flash_data->max_channels = 4;
regs = mvflash_4ch_regs; regs = devm_kmemdup(dev, mvflash_4ch_regs, sizeof(mvflash_4ch_regs),
GFP_KERNEL);
if (!regs)
return -ENOMEM;
rc = regmap_read(regmap, reg_base + FLASH_REVISION_REG, &val); rc = regmap_read(regmap, reg_base + FLASH_REVISION_REG, &val);
if (rc < 0) { if (rc < 0) {
@ -881,6 +887,7 @@ static int qcom_flash_led_probe(struct platform_device *pdev)
dev_err(dev, "Failed to allocate regmap field, rc=%d\n", rc); dev_err(dev, "Failed to allocate regmap field, rc=%d\n", rc);
return rc; return rc;
} }
devm_kfree(dev, regs); /* devm_regmap_field_bulk_alloc() makes copies */
platform_set_drvdata(pdev, flash_data); platform_set_drvdata(pdev, flash_data);
mutex_init(&flash_data->lock); mutex_init(&flash_data->lock);