From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932247AbcEYO1N (ORCPT ); Wed, 25 May 2016 10:27:13 -0400 Received: from mga09.intel.com ([134.134.136.24]:24267 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932175AbcEYO1J (ORCPT ); Wed, 25 May 2016 10:27:09 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,364,1459839600"; d="scan'208";a="988511405" From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= To: platform-driver-x86@vger.kernel.org Cc: linux-kernel@vger.kernel.org, =?UTF-8?q?Vincent=20Stehl=C3=A9?= , Sujith Thomas , Darren Hart , Zhang Rui , Len Brown Subject: [PATCH] intel_menlow: prevent NULL pointer dereference Date: Wed, 25 May 2016 16:20:11 +0200 Message-Id: <1464186011-732-1-git-send-email-vincent.stehle@intel.com> X-Mailer: git-send-email 2.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The function acpi_driver_data() will dereference its parameter; make sure to check for NULL pointer before we call it. Signed-off-by: Vincent Stehlé Cc: Sujith Thomas Cc: Darren Hart Cc: Zhang Rui Cc: Len Brown --- drivers/platform/x86/intel_menlow.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c index 0a919d8..185a1bd 100644 --- a/drivers/platform/x86/intel_menlow.c +++ b/drivers/platform/x86/intel_menlow.c @@ -196,9 +196,13 @@ static int intel_menlow_memory_add(struct acpi_device *device) static int intel_menlow_memory_remove(struct acpi_device *device) { - struct thermal_cooling_device *cdev = acpi_driver_data(device); + struct thermal_cooling_device *cdev; + + if (!device) + return -EINVAL; - if (!device || !cdev) + cdev = acpi_driver_data(device); + if (!cdev) return -EINVAL; sysfs_remove_link(&device->dev.kobj, "thermal_cooling"); -- 2.8.1