summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch')
-rw-r--r--meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch
new file mode 100644
index 0000000000..76b8c73630
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch
@@ -0,0 +1,41 @@
1From 360a55ddd309e3a45b227a4a905ae7120dd16169 Mon Sep 17 00:00:00 2001
2From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
3Date: Thu, 2 Apr 2009 14:21:12 +0300
4Subject: [PATCH] DSS2: Verify that overlay paddr != 0
5
6---
7 drivers/video/omap2/dss/dispc.c | 3 +++
8 drivers/video/omap2/dss/overlay.c | 3 +++
9 2 files changed, 6 insertions(+), 0 deletions(-)
10
11diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
12index 6cea545..2480a03 100644
13--- a/drivers/video/omap2/dss/dispc.c
14+++ b/drivers/video/omap2/dss/dispc.c
15@@ -1301,6 +1301,9 @@ static int _dispc_setup_plane(enum omap_plane plane,
16 s32 row_inc;
17 s32 pix_inc;
18
19+ if (paddr == 0)
20+ return -EINVAL;
21+
22 if (plane == OMAP_DSS_GFX) {
23 if (width != out_width || height != out_height)
24 return -EINVAL;
25diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c
26index 968edbe..9209acf 100644
27--- a/drivers/video/omap2/dss/overlay.c
28+++ b/drivers/video/omap2/dss/overlay.c
29@@ -331,6 +331,9 @@ static int dss_ovl_set_overlay_info(struct omap_overlay *ovl,
30 int r;
31 struct omap_overlay_info old_info;
32
33+ if (info->paddr == 0)
34+ return -EINVAL;
35+
36 old_info = ovl->info;
37 ovl->info = *info;
38
39--
401.5.6.5
41