Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-15 15:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] VPU: mediatek: fix null pointer dereference on pdev

Browse Source 
pdev is being null checked, however, prior to that it is being
dereferenced by platform_get_drvdata.  Move the assignments of
vpu and run to after the pdev null check to avoid a potential
null pointer dereference.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Tiffany Lin <tiffany.lin@mediatek.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Colin Ian King 2016-09-07 14:10:27 -03:00 committed by Mauro Carvalho Chehab
parent 67712beb2d
commit 211eba9e79
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/platform/mtk-vpu/mtk_vpu.c
View File

@ -534,9 +534,9 @@ static int load_requested_vpu(struct mtk_vpu *vpu,
int vpu_load_firmware(struct platform_device *pdev)
{
struct mtk_vpu *vpu = platform_get_drvdata(pdev);
struct mtk_vpu *vpu;
struct device *dev = &pdev->dev;
struct vpu_run *run = &vpu->run;
struct vpu_run *run;
const struct firmware *vpu_fw = NULL;
int ret;
@ -545,6 +545,9 @@ int vpu_load_firmware(struct platform_device *pdev)
return -EINVAL;
}
vpu = platform_get_drvdata(pdev);
run = &vpu->run;
mutex_lock(&vpu->vpu_mutex);
if (vpu->fw_loaded) {
mutex_unlock(&vpu->vpu_mutex);