Re: [PATCH 157/190] Revert "Input: ad7879 - add check for read errors in interrupt"

[Dmitry Torokhov]

Hi Greg,

On Wed, Apr 21, 2021 at 03:00:32PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit e85bb0beb6498c0dffe18a2f1f16d575bc175c32.
> 
> 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.

This one looks really OK to me and does not have to be reverted (unless
Aditya will come clean and show the error introduced?).

> 
> Cc: Aditya Pakki <pakki001@xxxxxxx>
> Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
>  drivers/input/touchscreen/ad7879.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
> index e850853328f1..8c4f3c193550 100644
> --- a/drivers/input/touchscreen/ad7879.c
> +++ b/drivers/input/touchscreen/ad7879.c
> @@ -245,14 +245,11 @@ static void ad7879_timer(struct timer_list *t)
>  static irqreturn_t ad7879_irq(int irq, void *handle)
>  {
>  	struct ad7879 *ts = handle;
> -	int error;
>  
> -	error = regmap_bulk_read(ts->regmap, AD7879_REG_XPLUS,
> -				 ts->conversion_data, AD7879_NR_SENSE);
> -	if (error)
> -		dev_err_ratelimited(ts->dev, "failed to read %#02x: %d\n",
> -				    AD7879_REG_XPLUS, error);
> -	else if (!ad7879_report(ts))
> +	regmap_bulk_read(ts->regmap, AD7879_REG_XPLUS,
> +			 ts->conversion_data, AD7879_NR_SENSE);
> +
> +	if (!ad7879_report(ts))
>  		mod_timer(&ts->timer, jiffies + TS_PEN_UP_TIMEOUT);
>  
>  	return IRQ_HANDLED;
> -- 
> 2.31.1
> 

Thanks.

-- 
Dmitry