Home| summaryrefslogtreecommitdiff |
| author | Danny Kukawka <dkukawka@suse.de> | 2012-01-25 10:51:08 (GMT) |
|---|---|---|
| committer | Danny Kukawka <dkukawka@suse.de> | 2012-01-25 10:51:08 (GMT) |
| commit | 2206a5c5b9aa64bd9a741830257f184818a0f6ee (patch) (side-by-side diff) | |
| tree | ff0c9958ece20c8b870dc82fd0b5e1de4d9b2e54 | |
| parent | 4fb112d4b059bdd833834bd9f7e2aecc7acc4eac (diff) | |
fix NULL pointer dereference in DSS2 VENC sysfs debug attr on OMAP4.rpm-3.2.0-2
| -rw-r--r-- | patches.fixes/0001-fix-NULL-pointer-dereference-in-DSS2-VENC-sysfs-debu.patch | 38 | ||||
| -rw-r--r-- | series.conf | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.fixes/0001-fix-NULL-pointer-dereference-in-DSS2-VENC-sysfs-debu.patch b/patches.fixes/0001-fix-NULL-pointer-dereference-in-DSS2-VENC-sysfs-debu.patch new file mode 100644 index 0000000..a63d8ce --- a/dev/null +++ b/patches.fixes/0001-fix-NULL-pointer-dereference-in-DSS2-VENC-sysfs-debu.patch @@ -0,0 +1,38 @@ +From f454ab8c6abba5245a1a00c7e29dc4dc37292341 Mon Sep 17 00:00:00 2001 +From: Danny Kukawka <danny.kukawka@bisect.de> +Date: Tue, 24 Jan 2012 14:53:28 +0100 +Subject: [PATCH] fix NULL pointer dereference in DSS2 VENC sysfs debug attr on OMAP4 +Patch-mainline: Submitted linux-omap 25Jan2012 + +Commit ba02fa37de80bea10d706f39f076dd848348320a disabled the +venc driver registration on OMAP4. Since the driver never gets +probed/initialised your get a dereferenceed NULL pointer if you +try to get info from /sys/kernel/debug/omapdss/venc + +Return info message about disabled venc if venc_dump_regs() gets called. + +Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de> +Signed-off-by: Danny Kukawka <dkukawka@suse.de> +--- + drivers/video/omap2/dss/venc.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c +index b3e9f90..82865be 100644 +--- a/drivers/video/omap2/dss/venc.c ++++ b/drivers/video/omap2/dss/venc.c +@@ -699,6 +699,11 @@ void venc_dump_regs(struct seq_file *s) + { + #define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, venc_read_reg(r)) + ++ if (cpu_is_omap44xx()) { ++ seq_printf(s, "VENC currently disabled on OMAP44xx\n"); ++ return; ++ } ++ + if (venc_runtime_get()) + return; + +-- +1.7.7.3 + diff --git a/series.conf b/series.conf index 1e0daf2..f951a5f 100644 --- a/series.conf +++ b/series.conf @@ -366,12 +366,13 @@ patches.fixes/scsi-ibmvscsi-module_alias.patch ######################################################## # DRM/Video ######################################################## + patches.fixes/0001-fix-NULL-pointer-dereference-in-DSS2-VENC-sysfs-debu.patch ######################################################## # video4linux ######################################################## ######################################################## |