openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: davinci/vpfe_capture.c: Avoid BUG_ON for register failure 

In vpfe_register_ccdc_device(), failure to allocate dev->hw_ops
fields calls BUG_ON(). This patch returns the error to callers
instead of crashing. The issue was identified by a static
analysis tool, written by us.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Aditya Pakki 2020-01-06 15:32:51 +01:00 committed by Mauro Carvalho Chehab
parent 7fcaed4ab4
commit b0e4cfae48
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/media/platform/davinci/vpfe_capture.c
View File

@ -168,21 +168,22 @@ int vpfe_register_ccdc_device(const struct ccdc_hw_device *dev)
int ret = 0; int ret = 0;
printk(KERN_NOTICE "vpfe_register_ccdc_device: %s\n", dev->name); printk(KERN_NOTICE "vpfe_register_ccdc_device: %s\n", dev->name);
BUG_ON(!dev->hw_ops.open); if (!dev->hw_ops.open ||
BUG_ON(!dev->hw_ops.enable); !dev->hw_ops.enable ||
BUG_ON(!dev->hw_ops.set_hw_if_params); !dev->hw_ops.set_hw_if_params ||
BUG_ON(!dev->hw_ops.configure); !dev->hw_ops.configure ||
BUG_ON(!dev->hw_ops.set_buftype); !dev->hw_ops.set_buftype ||
BUG_ON(!dev->hw_ops.get_buftype); !dev->hw_ops.get_buftype ||
BUG_ON(!dev->hw_ops.enum_pix); !dev->hw_ops.enum_pix ||
BUG_ON(!dev->hw_ops.set_frame_format); !dev->hw_ops.set_frame_format ||
BUG_ON(!dev->hw_ops.get_frame_format); !dev->hw_ops.get_frame_format ||
BUG_ON(!dev->hw_ops.get_pixel_format); !dev->hw_ops.get_pixel_format ||
BUG_ON(!dev->hw_ops.set_pixel_format); !dev->hw_ops.set_pixel_format ||
BUG_ON(!dev->hw_ops.set_image_window); !dev->hw_ops.set_image_window ||
BUG_ON(!dev->hw_ops.get_image_window); !dev->hw_ops.get_image_window ||
BUG_ON(!dev->hw_ops.get_line_length); !dev->hw_ops.get_line_length ||
BUG_ON(!dev->hw_ops.getfid); !dev->hw_ops.getfid)
return -EINVAL;
mutex_lock(&ccdc_lock); mutex_lock(&ccdc_lock);
if (!ccdc_cfg) { if (!ccdc_cfg) {