projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bdcc02c
)
drm/omap: fix NULL deref crash with SDI displays
author
Tomi Valkeinen
<tomi.valkeinen@ti.com>
Thu, 24 May 2018 07:58:25 +0000
(10:58 +0300)
committer
Tomi Valkeinen
<tomi.valkeinen@ti.com>
Thu, 24 May 2018 16:14:46 +0000
(19:14 +0300)
Fix a NULL deref bug introduced in commit
24aac6011f70
("drm: omapdrm:
sdi: Allocate the sdi private data structure dynamically").
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/2f803bfc-3ffe-332a-7b9a-d59a39db4630@ti.com
Fixes:
24aac6011f70
("drm: omapdrm: sdi: Allocate the sdi private data structure dynamically")
Reported-by: Tony Lindgren <tony@atomide.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Benoit Parrot <bparrot@ti.com>
drivers/gpu/drm/omapdrm/dss/sdi.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/omapdrm/dss/sdi.c
b/drivers/gpu/drm/omapdrm/dss/sdi.c
index
68a40ae
..
1e2c931
100644
(file)
--- a/
drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/
drivers/gpu/drm/omapdrm/dss/sdi.c
@@
-82,7
+82,7
@@
static int sdi_calc_clock_div(struct sdi_device *sdi, unsigned long pclk,
struct dispc_clock_info *dispc_cinfo)
{
int i;
- struct sdi_clk_calc_ctx ctx
= { .sdi = sdi }
;
+ struct sdi_clk_calc_ctx ctx;
/*
* DSS fclk gives us very few possibilities, so finding a good pixel
@@
-95,6
+95,9
@@
static int sdi_calc_clock_div(struct sdi_device *sdi, unsigned long pclk,
bool ok;
memset(&ctx, 0, sizeof(ctx));
+
+ ctx.sdi = sdi;
+
if (pclk > 1000 * i * i * i)
ctx.pck_min = max(pclk - 1000 * i * i * i, 0lu);
else