Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 1 Jun 2021 22:13:46 -0700
From:   Dmitry Torokhov <dmitry.torokhov@gmail.com>
To:     Qiang Ma <maqianga@uniontech.com>
Cc:     wangxiongfeng2@huawei.com, linux-input@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Input: psmouse - fix psmouse detect function is a NULL
 pointer
Message-ID: <YLcTilSGgW6jMKEy@google.com>
References: <20210519032335.19326-1-maqianga@uniontech.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210519032335.19326-1-maqianga@uniontech.com>
Precedence: bulk

Hi Qiang,

On Wed, May 19, 2021 at 11:23:35AM +0800, Qiang Ma wrote:
> Add a check for psmouse_do_detect(), when the detect is NULL pointer,
> returning false, avoiding this possible NULL pointer exception.
> 
> Signed-off-by: Qiang Ma <maqianga@uniontech.com>
> ---
>  drivers/input/mouse/psmouse-base.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
> index 0b4a3039f312..86b095728587 100644
> --- a/drivers/input/mouse/psmouse-base.c
> +++ b/drivers/input/mouse/psmouse-base.c
> @@ -1006,6 +1006,9 @@ static bool psmouse_do_detect(int (*detect)(struct psmouse *, bool),
>  	if (set_properties)
>  		psmouse_apply_defaults(psmouse);
>  
> +	if (!detect)
> +		return false;

There are no protocols that do not define detect() method, so this
condition is not possible.

> +
>  	return detect(psmouse, set_properties) == 0;
>  }
>  

Thanks.

-- 
Dmitry