From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC9E7C35240 for ; Fri, 24 Jan 2020 01:17:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E0C324655 for ; Fri, 24 Jan 2020 01:17:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579828672; bh=mT+Mylf0esXaJpgwHmYIz93oQT3mpdTi4KBdPMR82QA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=z/aeXITzpgwLgIFNoaTpBp5O8b6AGcWHOjDDV342ZHuz5HH9eGK1+//Glpqw3/zZS ZNP3cScTHvNJ19tVb8UlZpxbXIUukyrniMBUqYuCom7kmeiBcrNxpdjCZJvA1Y0haZ XNCXXYsJdOElK9ZK4Lo9kyJK5irxC+wgA8rIYbx4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730766AbgAXBRv (ORCPT ); Thu, 23 Jan 2020 20:17:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:60990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730745AbgAXBRr (ORCPT ); Thu, 23 Jan 2020 20:17:47 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B722B2467F; Fri, 24 Jan 2020 01:17:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579828666; bh=mT+Mylf0esXaJpgwHmYIz93oQT3mpdTi4KBdPMR82QA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g1bCdYTbYzwUu6lHNM89G/e5CdGfYHPxIDk8dQEnOKlDEtOllZRkVr3dtQqeJJY9m GGygq02g4oIFYT2dgcBOZsUnAIMQmp/y9U1gykQYyKdOjJwM7VnJKIIGJ8CEg74LqY dLlADTYHxnjbD1lMTSUIL6vkVPMXG0d7bGOu/5Bc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pan Zhang , Benjamin Tissoires , Sasha Levin , linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 33/33] drivers/hid/hid-multitouch.c: fix a possible null pointer access. Date: Thu, 23 Jan 2020 20:17:08 -0500 Message-Id: <20200124011708.18232-33-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200124011708.18232-1-sashal@kernel.org> References: <20200124011708.18232-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pan Zhang [ Upstream commit 306d5acbfc66e7cccb4d8f91fc857206b8df80d1 ] 1002 if ((quirks & MT_QUIRK_IGNORE_DUPLICATES) && mt) { 1003 struct input_mt_slot *i_slot = &mt->slots[slotnum]; 1004 1005 if (input_mt_is_active(i_slot) && 1006 input_mt_is_used(mt, i_slot)) 1007 return -EAGAIN; 1008 } We previously assumed 'mt' could be null (see line 1002). The following situation is similar, so add a judgement. Signed-off-by: Pan Zhang Signed-off-by: Benjamin Tissoires Signed-off-by: Sasha Levin --- drivers/hid/hid-multitouch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 3cfeb1629f79f..28aaa26bb44cf 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -1019,7 +1019,7 @@ static int mt_process_slot(struct mt_device *td, struct input_dev *input, tool = MT_TOOL_DIAL; else if (unlikely(!confidence_state)) { tool = MT_TOOL_PALM; - if (!active && + if (!active && mt && input_mt_is_active(&mt->slots[slotnum])) { /* * The non-confidence was reported for -- 2.20.1