[PATCH] omapfb: Add sanity check to omapfb_update_window_async

[PATCH] omapfb: Add sanity check to omapfb_update_window_async

[Arnaud Patard]

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]


This patch makes sure that the fb_info pointer given to
omapfb_update_window_async is not null.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
---

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: omapfb_update_window_async_check.patch --]
[-- Type: text/x-diff, Size: 880 bytes --]

---
 drivers/video/omap/omapfb_main.c |    9 	7 +	2 -	0 !
 1 file changed, 7 insertions(+), 2 deletions(-)

Index: linux-omap-2.6/drivers/video/omap/omapfb_main.c
===================================================================
--- linux-omap-2.6.orig/drivers/video/omap/omapfb_main.c	2007-01-14 14:10:26.000000000 +0100
+++ linux-omap-2.6/drivers/video/omap/omapfb_main.c	2007-01-14 14:10:29.000000000 +0100
@@ -626,10 +626,15 @@ int omapfb_update_window_async(struct fb
 				void (*callback)(void *),
 				void *callback_data)
 {
-	struct omapfb_plane_struct *plane = fbi->par;
-	struct omapfb_device *fbdev = plane->fbdev;
+	struct omapfb_plane_struct *plane;
+	struct omapfb_device *fbdev;
 	struct fb_var_screeninfo *var;
 
+	if (!fbi)
+		return -EINVAL;
+
+	plane = fbi->par;
+	fbdev = plane->fbdev;
 	var = &fbi->var;
 
 	if (win->x >= var->xres || win->y >= var->yres)

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] omapfb: Add sanity check to omapfb_update_window_async

[Tony Lindgren]

* Arnaud Patard <arnaud.patard@rtp-net.org> [070114 05:45]:
> 
> This patch makes sure that the fb_info pointer given to
> omapfb_update_window_async is not null.
> 
> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
> ---

> ---
>  drivers/video/omap/omapfb_main.c |    9 	7 +	2 -	0 !
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> Index: linux-omap-2.6/drivers/video/omap/omapfb_main.c
> ===================================================================
> --- linux-omap-2.6.orig/drivers/video/omap/omapfb_main.c	2007-01-14 14:10:26.000000000 +0100
> +++ linux-omap-2.6/drivers/video/omap/omapfb_main.c	2007-01-14 14:10:29.000000000 +0100
> @@ -626,10 +626,15 @@ int omapfb_update_window_async(struct fb
>  				void (*callback)(void *),
>  				void *callback_data)
>  {
> -	struct omapfb_plane_struct *plane = fbi->par;
> -	struct omapfb_device *fbdev = plane->fbdev;
> +	struct omapfb_plane_struct *plane;
> +	struct omapfb_device *fbdev;
>  	struct fb_var_screeninfo *var;
>  
> +	if (!fbi)
> +		return -EINVAL;
> +
> +	plane = fbi->par;
> +	fbdev = plane->fbdev;
>  	var = &fbi->var;
>  
>  	if (win->x >= var->xres || win->y >= var->yres)

Pushing today.

Tony