leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] s5p-fimc: Fix potential NULL pointer dereference

Browse Source 
'fimc' was being dereferenced before the NULL check.
Moved it to after the check.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sachin Kamat
2012-10-25 10:56:00 -03:00
committed by Mauro Carvalho Chehab
parent afd7348c60
commit 8163ec0b26
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/s5p-fimc/fimc-mdevice.c
View File

@@ -343,13 +343,14 @@ static int fimc_md_register_sensor_entities(struct fimc_md *fmd)
static int fimc_register_callback(struct device *dev, void *p) static int fimc_register_callback(struct device *dev, void *p)
{ {
struct fimc_dev *fimc = dev_get_drvdata(dev); struct fimc_dev *fimc = dev_get_drvdata(dev);
struct v4l2_subdev *sd = &fimc->vid_cap.subdev; struct v4l2_subdev *sd;
struct fimc_md *fmd = p; struct fimc_md *fmd = p;
int ret; int ret;
if (fimc == NULL || fimc->id >= FIMC_MAX_DEVS) if (fimc == NULL || fimc->id >= FIMC_MAX_DEVS)
return 0; return 0;
sd = &fimc->vid_cap.subdev;
sd->grp_id = FIMC_GROUP_ID; sd->grp_id = FIMC_GROUP_ID;
ret = v4l2_device_register_subdev(&fmd->v4l2_dev, sd); ret = v4l2_device_register_subdev(&fmd->v4l2_dev, sd);
@@ -367,16 +368,15 @@ static int fimc_register_callback(struct device *dev, void *p)
static int fimc_lite_register_callback(struct device *dev, void *p) static int fimc_lite_register_callback(struct device *dev, void *p)
{ {
struct fimc_lite *fimc = dev_get_drvdata(dev); struct fimc_lite *fimc = dev_get_drvdata(dev);
struct v4l2_subdev *sd = &fimc->subdev;
struct fimc_md *fmd = p; struct fimc_md *fmd = p;
int ret; int ret;
if (fimc == NULL || fimc->index >= FIMC_LITE_MAX_DEVS) if (fimc == NULL || fimc->index >= FIMC_LITE_MAX_DEVS)
return 0; return 0;
sd->grp_id = FLITE_GROUP_ID; fimc->subdev.grp_id = FLITE_GROUP_ID;
ret = v4l2_device_register_subdev(&fmd->v4l2_dev, sd); ret = v4l2_device_register_subdev(&fmd->v4l2_dev, &fimc->subdev);
if (ret) { if (ret) {
v4l2_err(&fmd->v4l2_dev, v4l2_err(&fmd->v4l2_dev,
"Failed to register FIMC-LITE.%d (%d)\n", "Failed to register FIMC-LITE.%d (%d)\n",