Skip to contentSkip to conversation

Input: twl4030_keypad - fix potential NULL dereference in twl4030_kp_probe()

PATCH RESEND In review Axel Lin 2 participants 2 messages Apr 12, 2011

Subsystems (2)
HID Input drivers
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH RESEND 1/1 Input: twl4030_keypad - fix potential NULL dereference in twl4030_kp_probe()

We should first check whether platform data is NULL or not, before dereferencing it to get the keymap.

Signed-off-by Axel Lin <[email protected]>
Reviewed-by Felipe Balbi <[email protected]>
---
 drivers/input/keyboard/twl4030_keypad.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/input/keyboard/twl4030_keypad.c +3 -1
index cc06c4b..a26922c 100644
@@ -332,7 +332,7 @@ static int __devinit twl4030_kp_program(struct twl4030_keypad *kp)
 static int __devinit twl4030_kp_probe(struct platform_device *pdev)
 {
 	struct twl4030_keypad_data *pdata = pdev->dev.platform_data;
-	const struct matrix_keymap_data *keymap_data = pdata->keymap_data;
+	const struct matrix_keymap_data *keymap_data;
 	struct twl4030_keypad *kp;
 	struct input_dev *input;
 	u8 reg;

@@ -344,6 +344,8 @@ static int __devinit twl4030_kp_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
+	keymap_data = pdata->keymap_data;
+
 	kp = kzalloc(sizeof(*kp), GFP_KERNEL);
 	input = input_allocate_device();
 	if (!kp || !input) {
Signature · 1 line
1.7.1