pata_platform: Fix NULL pointer dereference

pata_platform: Fix NULL pointer dereference

[Magnus Damm]

pata_platform: Fix NULL pointer dereference

pata_platform currently dereferences a NULL pointer in pata_platform_probe()
if pdev->dev.platform_data is set to NULL. This breakage was most likely
introduced by commit 5f45bc50976ee1f408f7171af155aec646655a37.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
---

 Tested on a Solution Engline 7722 board, fixes NULL dereference problem.
 Applies to linux-2.6 git 9a79b2274186fade17134929d4f85b70d59a3840
 Could someone please make sure this gets included in rc1?

 drivers/ata/pata_platform.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- 0001/drivers/ata/pata_platform.c
+++ work/drivers/ata/pata_platform.c	2007-07-20 12:09:04.000000000 +0900
@@ -213,8 +213,9 @@ static int __devinit pata_platform_probe
 	pata_platform_setup_port(&ap->ioaddr, pp_info);
 
 	/* activate */
-	return ata_host_activate(host, platform_get_irq(pdev, 0), ata_interrupt,
-				 pp_info->irq_flags, &pata_platform_sht);
+	return ata_host_activate(host, platform_get_irq(pdev, 0),
+				 ata_interrupt, pp_info ? pp_info->irq_flags
+				 : 0, &pata_platform_sht);
 }
 
 /**

Re: pata_platform: Fix NULL pointer dereference

[Paul Mundt]

On Fri, Jul 20, 2007 at 12:50:58PM +0900, Magnus Damm wrote:
> pata_platform: Fix NULL pointer dereference
> 
> pata_platform currently dereferences a NULL pointer in pata_platform_probe()
> if pdev->dev.platform_data is set to NULL. This breakage was most likely
> introduced by commit 5f45bc50976ee1f408f7171af155aec646655a37.
> 
> Signed-off-by: Magnus Damm <damm@igel.co.jp>

Without this, most of the sh and ppc pata_platform users won't boot.

Acked-by: Paul Mundt <lethal@linux-sh.org>

Re: pata_platform: Fix NULL pointer dereference

[Jeff Garzik]

Magnus Damm wrote:
> pata_platform: Fix NULL pointer dereference
> 
> pata_platform currently dereferences a NULL pointer in pata_platform_probe()
> if pdev->dev.platform_data is set to NULL. This breakage was most likely
> introduced by commit 5f45bc50976ee1f408f7171af155aec646655a37.
> 
> Signed-off-by: Magnus Damm <damm@igel.co.jp>
> ---
> 
>  Tested on a Solution Engline 7722 board, fixes NULL dereference problem.
>  Applies to linux-2.6 git 9a79b2274186fade17134929d4f85b70d59a3840
>  Could someone please make sure this gets included in rc1?
> 
>  drivers/ata/pata_platform.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

applied

Re: pata_platform: Fix NULL pointer dereference

[Linus Torvalds]

On Fri, 20 Jul 2007, Magnus Damm wrote:
> 
> pata_platform currently dereferences a NULL pointer in pata_platform_probe()
> if pdev->dev.platform_data is set to NULL. This breakage was most likely
> introduced by commit 5f45bc50976ee1f408f7171af155aec646655a37.

Ok, the *fix* looks real enough, but it seems that you have done your line 
splitting with a word processor rather than with a source code editor:

> +	return ata_host_activate(host, platform_get_irq(pdev, 0),
> +				 ata_interrupt, pp_info ? pp_info->irq_flags
> +				 : 0, &pata_platform_sht);

Please don't do things like this. Splitting up expressions across two 
lines just to make the line length come out "right" is silly.

So do the

	"pp_info ? pp_info->irq_flags : 0"

expression on one line.

And if it means that the line is longe rthan 80 characters, then so be it. 
It's ok. It's still more readable than the alternative.

			Linus "nit-picking bastard" Torvalds

Re: pata_platform: Fix NULL pointer dereference

[Jan Engelhardt]

On Jul 20 2007 09:12, Linus Torvalds wrote:
>Ok, the *fix* looks real enough, but it seems that you have done your line 
>splitting with a word processor rather than with a source code editor:
>
>> +	return ata_host_activate(host, platform_get_irq(pdev, 0),
>> +				 ata_interrupt, pp_info ? pp_info->irq_flags
>> +				 : 0, &pata_platform_sht);
>
>Please don't do things like this. Splitting up expressions across two 
>lines just to make the line length come out "right" is silly.
>
>So do the
>
>	"pp_info ? pp_info->irq_flags : 0"
>
>expression on one line.

Or just do

	return ata_host_activate(host, platform_get_irq(pdev, 0),
	       ata_interrupt, pp_info ? pp_info->irq_flags : 0,
	       &pata_platform_sht);

for returns, it's ok.


	Jan
--