diff options
| author | Seung-Woo Kim | 2013-07-02 10:57:04 +0200 |
|---|---|---|
| committer | Dave Airlie | 2013-07-04 02:52:50 +0200 |
| commit | fe2ef780669d9bbd2f921b247dc79266b00b99ab (patch) | |
| tree | e907ef6b4c9a7e7129a431e8a2b7275ce0e9975e /drivers/gpu/drm/drm_edid.c | |
| parent | drm: Convert drm class driver from legacy pm ops to dev_pm_ops (diff) | |
| download | kernel-qcow2-linux-fe2ef780669d9bbd2f921b247dc79266b00b99ab.tar.gz kernel-qcow2-linux-fe2ef780669d9bbd2f921b247dc79266b00b99ab.tar.xz kernel-qcow2-linux-fe2ef780669d9bbd2f921b247dc79266b00b99ab.zip | |
drm: add assertion for checking null edid to drm_edid_block_valid
If raw_edid of drm_edid_block_vaild() is null, it will crash, so
checking in bad label is removed and instead assertion is added at
the top of the function.
The type of return for the function is bool, so it fixes to return
true and false instead of 1 and 0.
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
| -rw-r--r-- | drivers/gpu/drm/drm_edid.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 2dc1a60a867d..95d6f4b6967c 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -968,6 +968,9 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid) u8 csum = 0; struct edid *edid = (struct edid *)raw_edid; + if (WARN_ON(!raw_edid)) + return false; + if (edid_fixup > 8 || edid_fixup < 0) edid_fixup = 6; @@ -1010,15 +1013,15 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid) break; } - return 1; + return true; bad: - if (raw_edid && print_bad_edid) { + if (print_bad_edid) { printk(KERN_ERR "Raw EDID:\n"); print_hex_dump(KERN_ERR, " \t", DUMP_PREFIX_NONE, 16, 1, raw_edid, EDID_LENGTH, false); } - return 0; + return false; } EXPORT_SYMBOL(drm_edid_block_valid); |