| Message ID | 20161116191650.11486-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 16/11/16 20:16, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > pdev is dereferenced using platform_get_drvdata before a check to > see if it is null, hence there could be a potential null pointer > dereference issue. Instead, first check if pdev is null and only then > deference pdev when initializing vpu. > > Found with static analysis by CoverityScan, CID 1357797 > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- Reviewed-by: Matthias Brugger <mbrugger@suse.com> > drivers/media/platform/mtk-vpu/mtk_vpu.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c > index c9bf58c..41f31b2 100644 > --- a/drivers/media/platform/mtk-vpu/mtk_vpu.c > +++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c > @@ -523,9 +523,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; > > @@ -533,6 +533,8 @@ int vpu_load_firmware(struct platform_device *pdev) > dev_err(dev, "VPU platform device is invalid\n"); > return -EINVAL; > } > + vpu = platform_get_drvdata(pdev); > + run = &vpu->run; > > mutex_lock(&vpu->vpu_mutex); > if (vpu->fw_loaded) { >
On Wed, 2016-11-16 at 19:16 +0000, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > pdev is dereferenced using platform_get_drvdata before a check to > see if it is null, hence there could be a potential null pointer > dereference issue. Instead, first check if pdev is null and only then > deference pdev when initializing vpu. > > Found with static analysis by CoverityScan, CID 1357797 > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- Reviewed-by: Andrew-CT Chen <andrew-ct.chen@mediatek.com> > drivers/media/platform/mtk-vpu/mtk_vpu.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c > index c9bf58c..41f31b2 100644 > --- a/drivers/media/platform/mtk-vpu/mtk_vpu.c > +++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c > @@ -523,9 +523,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; > > @@ -533,6 +533,8 @@ int vpu_load_firmware(struct platform_device *pdev) > dev_err(dev, "VPU platform device is invalid\n"); > return -EINVAL; > } > + vpu = platform_get_drvdata(pdev); > + run = &vpu->run; > > mutex_lock(&vpu->vpu_mutex); > if (vpu->fw_loaded) {
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c index c9bf58c..41f31b2 100644 --- a/drivers/media/platform/mtk-vpu/mtk_vpu.c +++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c @@ -523,9 +523,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; @@ -533,6 +533,8 @@ int vpu_load_firmware(struct platform_device *pdev) dev_err(dev, "VPU platform device is invalid\n"); return -EINVAL; } + vpu = platform_get_drvdata(pdev); + run = &vpu->run; mutex_lock(&vpu->vpu_mutex); if (vpu->fw_loaded) {