aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/via
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-02-17 09:45:01 +0300
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-02-17 07:56:21 +0000
commitc572c8bbff13591f6c9f249d4413f79ddda21e61 (patch)
treebaa8c5d1b144adb6a31f2f90d51fb52c43d3f738 /drivers/video/via
parentMerge branch 'viafb-aux' into viafb-next (diff)
downloadlinux-dev-c572c8bbff13591f6c9f249d4413f79ddda21e61.tar.xz
linux-dev-c572c8bbff13591f6c9f249d4413f79ddda21e61.zip
viafb: NULL dereference on allocation failure in query_edid()
We should handle the allocation here, if only to keep the static checkers happy. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/via')
-rw-r--r--drivers/video/via/via_aux_edid.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/via/via_aux_edid.c b/drivers/video/via/via_aux_edid.c
index 03f7a41c8a3f..754d4509033f 100644
--- a/drivers/video/via/via_aux_edid.c
+++ b/drivers/video/via/via_aux_edid.c
@@ -36,10 +36,13 @@ static void query_edid(struct via_aux_drv *drv)
unsigned char edid[EDID_LENGTH];
bool valid = false;
- if (spec)
+ if (spec) {
fb_destroy_modedb(spec->modedb);
- else
+ } else {
spec = kmalloc(sizeof(*spec), GFP_KERNEL);
+ if (!spec)
+ return;
+ }
spec->version = spec->revision = 0;
if (via_aux_read(drv, 0x00, edid, EDID_LENGTH)) {