Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1712032pxj; Wed, 19 May 2021 12:06:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzu10gO3NfZO4uY2tWcpKNhxW0guZbd8QCEIR4S6G5vl/HhBfNm3yUTLl2fwHBe+1MqeX6g X-Received: by 2002:a05:6638:120f:: with SMTP id n15mr608005jas.56.1621451168483; Wed, 19 May 2021 12:06:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621451168; cv=none; d=google.com; s=arc-20160816; b=ulERH5w8irLP66DzwUl/xZXJLXyFFU0Gi5aWMXw3s27T/zpCYpBkQkMUXE6bB1eNmd HuGKFVftypIbibuzGhQ59V7VZ1dddYrWCxokeZ2D1651fVRlhEigkxaFDoREju1L9Qbx q6vw4kwtfErfop2EuojJhTWxqH/U3+H1QmouJQCjsSdxmgTJOP2CMeliWJ2WsWFm6S/+ 73UK3Rj6s4MGIC0j44W3nhUVDeIATJlgjTuH5JSElmd8SXVv1i1encco9Hep4p1cxcx5 cv+TaPOXd6fXLskCMIk1kPjxae+kZGbEUxAM4AFBU7FQg0JIPrHLBojsrwiNxSroFc31 9ZtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=P19gEgSWmadOCnQCUObIIy6x3wpuI4yWKHSv79+opAA=; b=cn+PboWKit5o+c/lMDUruivIgynle+qoqF0SwAY6OKehOvxlF/7XVv1gPwltcgmfaP W2zL5W1Q1VV0PLFp30ayCjBAl0eC02uOtZj3P+uJLs7CRPrDSCdaqwgezL71Ti8nDdYB O2OGNCSFIXCe7Io7cFloapkUNGMhBEJaxWOhEXsnJhB4uK8JT74CvLHQOV3qQi3L6bzO /q9xZ62XP/uv3BO8eU+5HYlxVRRM/eXY5CHvc8nujpz/IZaWsYWGnC+PNbVzui5I9MhQ UN1U9N37Cy5KDbAh0QfnfQvallXCiYTRIV5jEUYWseD4TtW0us5Tlnts83kozu7glU2J HzJA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g19si128063iow.22.2021.05.19.12.05.53; Wed, 19 May 2021 12:06:08 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352981AbhESD3I (ORCPT + 99 others); Tue, 18 May 2021 23:29:08 -0400 Received: from lucky1.263xmail.com ([211.157.147.133]:42900 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352980AbhESD3I (ORCPT ); Tue, 18 May 2021 23:29:08 -0400 Received: from localhost (unknown [192.168.167.235]) by lucky1.263xmail.com (Postfix) with ESMTP id 4FBD7CD5DA; Wed, 19 May 2021 11:27:40 +0800 (CST) X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-ADDR-CHECKED4: 1 X-ANTISPAM-LEVEL: 2 X-ABS-CHECKED: 0 Received: from localhost.localdomain (unknown [111.207.172.18]) by smtp.263.net (postfix) whith ESMTP id P31747T140095115986688S1621394617351821_; Wed, 19 May 2021 11:24:16 +0800 (CST) X-IP-DOMAINF: 1 X-UNIQUE-TAG: <8d48550458bea6c8e04709089b6d10f3> X-RL-SENDER: maqianga@uniontech.com X-SENDER: maqianga@uniontech.com X-LOGIN-NAME: maqianga@uniontech.com X-FST-TO: dmitry.torokhov@gmail.com X-RCPT-COUNT: 5 X-SENDER-IP: 111.207.172.18 X-ATTACHMENT-NUM: 0 X-System-Flag: 0 From: Qiang Ma To: dmitry.torokhov@gmail.com, wangxiongfeng2@huawei.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Qiang Ma Subject: [PATCH] Input: psmouse - fix psmouse detect function is a NULL pointer Date: Wed, 19 May 2021 11:23:35 +0800 Message-Id: <20210519032335.19326-1-maqianga@uniontech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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; + return detect(psmouse, set_properties) == 0; } -- 2.20.1