[PATCH] Prevent the NULL dereferencing

[PATCH] Prevent the NULL dereferencing

[shubhrajyoti]

From: Shubhrajyoti D <a0393217@india.ti.com>


Signed-off-by: Shubhrajyoti D <a0393217@india.ti.com>
---
 drivers/input/keyboard/twl4030_keypad.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
index 09bef79..cc06c4b 100644
--- a/drivers/input/keyboard/twl4030_keypad.c
+++ b/drivers/input/keyboard/twl4030_keypad.c
@@ -338,7 +338,7 @@ static int __devinit twl4030_kp_probe(struct platform_device *pdev)
 	u8 reg;
 	int error;
 
-	if (!pdata || !pdata->rows || !pdata->cols ||
+	if (!pdata || !pdata->rows || !pdata->cols || !pdata->keymap_data ||
 	    pdata->rows > TWL4030_MAX_ROWS || pdata->cols > TWL4030_MAX_COLS) {
 		dev_err(&pdev->dev, "Invalid platform_data\n");
 		return -EINVAL;
-- 
1.7.1

Re: [PATCH] Prevent the NULL dereferencing

[Shubhrajyoti]

On Tuesday 05 April 2011 03:28 PM, shubhrajyoti@ti.com wrote:
> From: Shubhrajyoti D<a0393217@india.ti.com>
>
>
> Signed-off-by: Shubhrajyoti D<a0393217@india.ti.com>
Axel's patch added changes to prevent NULL access if pdata is NULL 
adding a check for keymap_data.
> ---
>   drivers/input/keyboard/twl4030_keypad.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
> index 09bef79..cc06c4b 100644
> --- a/drivers/input/keyboard/twl4030_keypad.c
> +++ b/drivers/input/keyboard/twl4030_keypad.c
> @@ -338,7 +338,7 @@ static int __devinit twl4030_kp_probe(struct platform_device *pdev)
>   	u8 reg;
>   	int error;
>
> -	if (!pdata || !pdata->rows || !pdata->cols ||
> +	if (!pdata || !pdata->rows || !pdata->cols || !pdata->keymap_data ||
>   	    pdata->rows>  TWL4030_MAX_ROWS || pdata->cols>  TWL4030_MAX_COLS) {
>   		dev_err(&pdev->dev, "Invalid platform_data\n");
>   		return -EINVAL;

Re: [PATCH] Prevent the NULL dereferencing

[Axel Lin]

2011/4/5 Shubhrajyoti <shubhrajyoti@ti.com>:
> On Tuesday 05 April 2011 03:28 PM, shubhrajyoti@ti.com wrote:
>>
>> From: Shubhrajyoti D<a0393217@india.ti.com>
>>
>>
>> Signed-off-by: Shubhrajyoti D<a0393217@india.ti.com>
>
> Axel's patch added changes to prevent NULL access if pdata is NULL adding a
> check for keymap_data.
>>

Acked-by: Axel Lin <axel.lin@gmail.com>

Re: [PATCH] Prevent the NULL dereferencing

[Dmitry Torokhov]

On Wed, Apr 06, 2011 at 08:47:12PM +0800, Axel Lin wrote:
> 2011/4/5 Shubhrajyoti <shubhrajyoti@ti.com>:
> > On Tuesday 05 April 2011 03:28 PM, shubhrajyoti@ti.com wrote:
> >>
> >> From: Shubhrajyoti D<a0393217@india.ti.com>
> >>
> >>
> >> Signed-off-by: Shubhrajyoti D<a0393217@india.ti.com>
> >
> > Axel's patch added changes to prevent NULL access if pdata is NULL adding a
> > check for keymap_data.
> >>
> 
> Acked-by: Axel Lin <axel.lin@gmail.com>

Applied, thanks Shubhrajyoti.

-- 
Dmitry