lkml.org 
[lkml]   [2021]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 056/190] Revert "media: davinci/vpfe_capture.c: Avoid BUG_ON for register failure"
    Date
    This reverts commit b0e4cfae483fe1e3db71ab2d8509490df60e52c6.

    Commits from @umn.edu addresses have been found to be submitted in "bad
    faith" to try to test the kernel community's ability to review "known
    malicious" changes. The result of these submissions can be found in a
    paper published at the 42nd IEEE Symposium on Security and Privacy
    entitled, "Open Source Insecurity: Stealthily Introducing
    Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University
    of Minnesota) and Kangjie Lu (University of Minnesota).

    Because of this, all submissions from this group must be reverted from
    the kernel tree and will need to be re-reviewed again to determine if
    they actually are a valid fix. Until that work is complete, remove this
    change to ensure that no problems are being introduced into the
    codebase.

    Cc: Aditya Pakki <pakki001@umn.edu>
    Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/media/platform/davinci/vpfe_capture.c | 31 +++++++++----------
    1 file changed, 15 insertions(+), 16 deletions(-)

    diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
    index f9f7dd17c57c..bcedaf4523e0 100644
    --- a/drivers/media/platform/davinci/vpfe_capture.c
    +++ b/drivers/media/platform/davinci/vpfe_capture.c
    @@ -168,22 +168,21 @@ int vpfe_register_ccdc_device(const struct ccdc_hw_device *dev)
    int ret = 0;
    printk(KERN_NOTICE "vpfe_register_ccdc_device: %s\n", dev->name);

    - if (!dev->hw_ops.open ||
    - !dev->hw_ops.enable ||
    - !dev->hw_ops.set_hw_if_params ||
    - !dev->hw_ops.configure ||
    - !dev->hw_ops.set_buftype ||
    - !dev->hw_ops.get_buftype ||
    - !dev->hw_ops.enum_pix ||
    - !dev->hw_ops.set_frame_format ||
    - !dev->hw_ops.get_frame_format ||
    - !dev->hw_ops.get_pixel_format ||
    - !dev->hw_ops.set_pixel_format ||
    - !dev->hw_ops.set_image_window ||
    - !dev->hw_ops.get_image_window ||
    - !dev->hw_ops.get_line_length ||
    - !dev->hw_ops.getfid)
    - return -EINVAL;
    + BUG_ON(!dev->hw_ops.open);
    + BUG_ON(!dev->hw_ops.enable);
    + BUG_ON(!dev->hw_ops.set_hw_if_params);
    + BUG_ON(!dev->hw_ops.configure);
    + BUG_ON(!dev->hw_ops.set_buftype);
    + BUG_ON(!dev->hw_ops.get_buftype);
    + BUG_ON(!dev->hw_ops.enum_pix);
    + BUG_ON(!dev->hw_ops.set_frame_format);
    + BUG_ON(!dev->hw_ops.get_frame_format);
    + BUG_ON(!dev->hw_ops.get_pixel_format);
    + BUG_ON(!dev->hw_ops.set_pixel_format);
    + BUG_ON(!dev->hw_ops.set_image_window);
    + BUG_ON(!dev->hw_ops.get_image_window);
    + BUG_ON(!dev->hw_ops.get_line_length);
    + BUG_ON(!dev->hw_ops.getfid);

    mutex_lock(&ccdc_lock);
    if (!ccdc_cfg) {
    --
    2.31.1
    \
     
     \ /
      Last update: 2021-04-21 15:05    [W:2.210 / U:0.612 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site