Re: [PATCH 160/190] Revert "Staging: rts5208: Fix error handling on rtsx_send_cmd"

Greg Kroah-Hartman
2021-04-27T17:40:57Z

On Wed, Apr 21, 2021 at 03:00:35PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit c8c2702409430a6a2fd928e857f15773aaafcc99.
>
> 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> drivers/staging/rts5208/sd.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
> index 25c31496757e..63f5465a6eeb 100644
> --- a/drivers/staging/rts5208/sd.c
> +++ b/drivers/staging/rts5208/sd.c
> @@ -4424,12 +4424,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)
> rtsx_init_cmd(chip);
> rtsx_add_cmd(chip, CHECK_REG_CMD, 0xFD30, 0x02, 0x02);
>
> - retval = rtsx_send_cmd(chip, SD_CARD, 250);
> - if (retval < 0) {
> - write_err = true;
> - rtsx_clear_sd_error(chip);
> - goto sd_execute_write_cmd_failed;
> - }
> + rtsx_send_cmd(chip, SD_CARD, 250);
>
> retval = sd_update_lock_status(chip);
> if (retval != STATUS_SUCCESS) {
> --
> 2.31.1
>

The original looks correct to me, so I'll drop the revert.

greg k-h