From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tiffany Lin Subject: Re: [PATCH] [media] VPU: mediatek: fix null pointer dereference on pdev Date: Thu, 8 Sep 2016 13:21:46 +0800 Message-ID: <1473312106.22713.1.camel@mtksdaap41> References: <20160907171027.16424-1-colin.king@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20160907171027.16424-1-colin.king-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+glpam-linux-mediatek=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: Colin King Cc: Andrew-CT Chen , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Wei Yongjun , Hans Verkuil , Matthias Brugger , linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Mauro Carvalho Chehab , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-mediatek@lists.infradead.org On Wed, 2016-09-07 at 18:10 +0100, Colin King wrote: > From: Colin Ian King > > 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. > Reviewed-by:Tiffany Lin > Signed-off-by: Colin Ian King > --- > drivers/media/platform/mtk-vpu/mtk_vpu.c | 7 +++++-- > 1 file changed, 5 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..43907a3 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; > > @@ -534,6 +534,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);