Re: [PATCH 150/190] Revert "media: gspca: mt9m111: Check write_bridge for timeout"

Greg Kroah-Hartman
2021-04-27T13:22:46Z

On Wed, Apr 21, 2021 at 03:00:25PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit 656025850074f5c1ba2e05be37bda57ba2b8d491.
>
> 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: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/usb/gspca/m5602/m5602_mt9m111.c b/drivers/media/usb/gspca/m5602/m5602_mt9m111.c
> index bfa3b381d8a2..50481dc928d0 100644
> --- a/drivers/media/usb/gspca/m5602/m5602_mt9m111.c
> +++ b/drivers/media/usb/gspca/m5602/m5602_mt9m111.c
> @@ -195,7 +195,7 @@ static const struct v4l2_ctrl_config mt9m111_greenbal_cfg = {
> int mt9m111_probe(struct sd *sd)
> {
> u8 data[2] = {0x00, 0x00};
> - int i, rc = 0;
> + int i;
> struct gspca_dev *gspca_dev = (struct gspca_dev *)sd;
>
> if (force_sensor) {
> @@ -213,18 +213,16 @@ int mt9m111_probe(struct sd *sd)
> /* Do the preinit */
> for (i = 0; i < ARRAY_SIZE(preinit_mt9m111); i++) {
> if (preinit_mt9m111[i][0] == BRIDGE) {
> - rc |= m5602_write_bridge(sd,
> + m5602_write_bridge(sd,
> preinit_mt9m111[i][1],
> preinit_mt9m111[i][2]);
> } else {
> data[0] = preinit_mt9m111[i][2];
> data[1] = preinit_mt9m111[i][3];
> - rc |= m5602_write_sensor(sd,
> + m5602_write_sensor(sd,
> preinit_mt9m111[i][1], data, 2);
> }
> }
> - if (rc < 0)
> - return rc;
>
> if (m5602_read_sensor(sd, MT9M111_SC_CHIPVER, data, 2))
> return -ENODEV;
> --
> 2.31.1
>

Same here, OR error values together is not ok, keeping this revert.

greg k-h