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=ham 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 31F9DC33CB3 for ; Thu, 16 Jan 2020 18:29:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05D4820684 for ; Thu, 16 Jan 2020 18:29:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579199389; bh=g6uqihEh1P5ymdNJpITG83arTR8dSTBoMRFQPVWkLPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zlOrtDOttwENG5z3NuQQrswF6xtjyDpLhUqy59tAkOHlcOwX3miYFWbX167Hfz+AY p9++bCDMjz+UAxxdHsZBAmfIZwIap/II3YPtTvrKDwsjrFKuJgn5yexILgEHHzD98/ 1xP4d3BHrnhXbcTp6I4k2wEiWng6a0/naa6XtP7I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392154AbgAPRZp (ORCPT ); Thu, 16 Jan 2020 12:25:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:33090 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391930AbgAPRZX (ORCPT ); Thu, 16 Jan 2020 12:25:23 -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 6A3D9246CA; Thu, 16 Jan 2020 17:25:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195523; bh=g6uqihEh1P5ymdNJpITG83arTR8dSTBoMRFQPVWkLPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u4u0ulRPdf9ZgXihtUg3ShwzXNtluWfKa3IcNaNYiy6aiEkyg426bX5Tf+jXutBHu STITvF/1UnXKenJOacPT2NRFL3crDOJbpRnbzIqnYPQ4fdfgTKGOcB1t3QkEmfE3Q3 Hc0TQWDgCSFyhdHZvmF38AbdifqEDDq8WUge6TzQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mattias Jacobsson <2pi@mok.nu>, Darren Hart , Sasha Levin , platform-driver-x86@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 120/371] platform/x86: wmi: fix potential null pointer dereference Date: Thu, 16 Jan 2020 12:19:52 -0500 Message-Id: <20200116172403.18149-63-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116172403.18149-1-sashal@kernel.org> References: <20200116172403.18149-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: Mattias Jacobsson <2pi@mok.nu> [ Upstream commit c355ec651a8941864549f2586f969d0eb7bf499a ] In the function wmi_dev_match() the variable id is dereferenced without first performing a NULL check. The variable can for example be NULL if a WMI driver is registered without specifying the id_table field in struct wmi_driver. Add a NULL check and return that the driver can't handle the device if the variable is NULL. Fixes: 844af950da94 ("platform/x86: wmi: Turn WMI into a bus driver") Signed-off-by: Mattias Jacobsson <2pi@mok.nu> Signed-off-by: Darren Hart (VMware) Signed-off-by: Sasha Levin --- drivers/platform/x86/wmi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 7f8fa42a1084..a56e997816b2 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -748,6 +748,9 @@ static int wmi_dev_match(struct device *dev, struct device_driver *driver) struct wmi_block *wblock = dev_to_wblock(dev); const struct wmi_device_id *id = wmi_driver->id_table; + if (id == NULL) + return 0; + while (id->guid_string) { uuid_le driver_guid; -- 2.20.1