Input: mtk-pmic-keys - fix possible null pointer dereference

commit 11cdb506d0fbf5ac05bf55f5afcb3a215c316490 upstream.

In mtk_pmic_keys_probe, the regs parameter is only set if the button is
parsed in the device tree. However, on hardware where the button is left
floating, that node will most likely be removed not to enable that
input. In that case the code will try to dereference a null pointer.

Let's use the regs struct instead as it is defined for all supported
platforms. Note that it is ok setting the key reg even if that latter is
disabled as the interrupt won't be enabled anyway.

Fixes: b581acb49aec ("Input: mtk-pmic-keys - transfer per-key bit in mtk_pmic_keys_regs")
Signed-off-by: Gary Bisson <bisson.gary@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/input/keyboard/mtk-pmic-keys.c b/drivers/input/keyboard/mtk-pmic-keys.c
index 4364c3401ff1c60702a2251bfa0ce836b4bf14c2..486ca8ff86f8303e4306e244a5562294defb7001 100644 (file)
--- a/drivers/input/keyboard/mtk-pmic-keys.c
+++ b/drivers/input/keyboard/mtk-pmic-keys.c
@@ -147,8 +147,8 @@ static void mtk_pmic_keys_lp_reset_setup(struct mtk_pmic_keys *keys,
        u32 value, mask;
        int error;
 
-       kregs_home = keys->keys[MTK_PMIC_HOMEKEY_INDEX].regs;
-       kregs_pwr = keys->keys[MTK_PMIC_PWRKEY_INDEX].regs;
+       kregs_home = &regs->keys_regs[MTK_PMIC_HOMEKEY_INDEX];
+       kregs_pwr = &regs->keys_regs[MTK_PMIC_PWRKEY_INDEX];
 
        error = of_property_read_u32(keys->dev->of_node, "power-off-time-sec",
                                     &long_press_debounce);