[151/190] Revert "media: gspca: Check the return value of write_bridge for timeout"
diff mbox series

Message ID 20210421130105.1226686-152-gregkh@linuxfoundation.org
State New, archived
Headers show
Series
  • Revertion of all of the umn.edu commits
Related show

Commit Message

Greg KH April 21, 2021, 1 p.m. UTC
This reverts commit a21a0eb56b4e8fe4a330243af8030f890cde2283.

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_po1030.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

Greg KH April 27, 2021, 1:22 p.m. UTC | #1
On Wed, Apr 21, 2021 at 03:00:26PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit a21a0eb56b4e8fe4a330243af8030f890cde2283.
> 
> 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_po1030.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/media/usb/gspca/m5602/m5602_po1030.c b/drivers/media/usb/gspca/m5602/m5602_po1030.c
> index d680b777f097..7bdbb8065146 100644
> --- a/drivers/media/usb/gspca/m5602/m5602_po1030.c
> +++ b/drivers/media/usb/gspca/m5602/m5602_po1030.c
> @@ -154,7 +154,6 @@ static const struct v4l2_ctrl_config po1030_greenbal_cfg = {
>  
>  int po1030_probe(struct sd *sd)
>  {
> -	int rc = 0;
>  	u8 dev_id_h = 0, i;
>  	struct gspca_dev *gspca_dev = (struct gspca_dev *)sd;
>  
> @@ -174,14 +173,11 @@ int po1030_probe(struct sd *sd)
>  	for (i = 0; i < ARRAY_SIZE(preinit_po1030); i++) {
>  		u8 data = preinit_po1030[i][2];
>  		if (preinit_po1030[i][0] == SENSOR)
> -			rc |= m5602_write_sensor(sd,
> +			m5602_write_sensor(sd,
>  				preinit_po1030[i][1], &data, 1);
>  		else
> -			rc |= m5602_write_bridge(sd, preinit_po1030[i][1],
> -						data);
> +			m5602_write_bridge(sd, preinit_po1030[i][1], data);
>  	}
> -	if (rc < 0)
> -		return rc;
>  
>  	if (m5602_read_sensor(sd, PO1030_DEVID_H, &dev_id_h, 1))
>  		return -ENODEV;
> -- 
> 2.31.1
> 

You do not OR error values together and expect the end result to be
anything sane, so I am keeping this revert as it is incorrect.

thanks,

greg k-h

Patch
diff mbox series

diff --git a/drivers/media/usb/gspca/m5602/m5602_po1030.c b/drivers/media/usb/gspca/m5602/m5602_po1030.c
index d680b777f097..7bdbb8065146 100644
--- a/drivers/media/usb/gspca/m5602/m5602_po1030.c
+++ b/drivers/media/usb/gspca/m5602/m5602_po1030.c
@@ -154,7 +154,6 @@  static const struct v4l2_ctrl_config po1030_greenbal_cfg = {
 
 int po1030_probe(struct sd *sd)
 {
-	int rc = 0;
 	u8 dev_id_h = 0, i;
 	struct gspca_dev *gspca_dev = (struct gspca_dev *)sd;
 
@@ -174,14 +173,11 @@  int po1030_probe(struct sd *sd)
 	for (i = 0; i < ARRAY_SIZE(preinit_po1030); i++) {
 		u8 data = preinit_po1030[i][2];
 		if (preinit_po1030[i][0] == SENSOR)
-			rc |= m5602_write_sensor(sd,
+			m5602_write_sensor(sd,
 				preinit_po1030[i][1], &data, 1);
 		else
-			rc |= m5602_write_bridge(sd, preinit_po1030[i][1],
-						data);
+			m5602_write_bridge(sd, preinit_po1030[i][1], data);
 	}
-	if (rc < 0)
-		return rc;
 
 	if (m5602_read_sensor(sd, PO1030_DEVID_H, &dev_id_h, 1))
 		return -ENODEV;