From patchwork Wed Dec 30 06:19:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 70199 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBU6Jded006888 for ; Wed, 30 Dec 2009 06:19:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751989AbZL3GTi (ORCPT ); Wed, 30 Dec 2009 01:19:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752160AbZL3GTi (ORCPT ); Wed, 30 Dec 2009 01:19:38 -0500 Received: from vms173015pub.verizon.net ([206.46.173.15]:49092 "EHLO vms173015pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751989AbZL3GTi (ORCPT ); Wed, 30 Dec 2009 01:19:38 -0500 Received: from localhost.localdomain ([74.104.151.18]) by vms173015.mailsrvcs.net (Sun Java(tm) System Messaging Server 6.3-7.04 (built Sep 26 2008; 32bit)) with ESMTPA id <0KVG002SFC83EZE6@vms173015.mailsrvcs.net>; Wed, 30 Dec 2009 00:19:16 -0600 (CST) Received: from localhost.localdomain (d975xbx2 [127.0.0.1]) by localhost.localdomain (8.14.2/8.14.2) with ESMTP id nBU6JEWX032681; Wed, 30 Dec 2009 01:19:14 -0500 Received: from localhost (lenb@localhost) by localhost.localdomain (8.14.2/8.14.2/Submit) with ESMTP id nBU6JCc1032676; Wed, 30 Dec 2009 01:19:13 -0500 X-Authentication-warning: localhost.localdomain: lenb owned process doing -bs Date: Wed, 30 Dec 2009 01:19:12 -0500 (EST) From: Len Brown X-X-Sender: lenb@localhost.localdomain To: Paul Rolland Cc: Ingo Molnar , Linus Torvalds , Dmitry Torokhov , Matthew Garrett , Linux Kernel Mailing List , rol@witbe.net, werner , linux-acpi@vger.kernel.org Subject: [PATCH] wmi: check find_guid() return value to prevent oops In-reply-to: <20091228175301.4e89aa65@tux.DEF.witbe.net> Message-id: References: <20091225102731.GA25513@elte.hu> <20091228094444.GG24690@elte.hu> <20091228120125.GA10911@elte.hu> <20091228160212.1f70d825@tux.DEF.witbe.net> <20091228175301.4e89aa65@tux.DEF.witbe.net> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-version: 1.0 Content-type: TEXT/PLAIN; charset=US-ASCII Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 9f93d6c..cc9ad74 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -492,8 +492,7 @@ wmi_notify_handler handler, void *data) if (!guid || !handler) return AE_BAD_PARAMETER; - find_guid(guid, &block); - if (!block) + if (!find_guid(guid, &block)) return AE_NOT_EXIST; if (block->handler) @@ -521,8 +520,7 @@ acpi_status wmi_remove_notify_handler(const char *guid) if (!guid) return AE_BAD_PARAMETER; - find_guid(guid, &block); - if (!block) + if (!find_guid(guid, &block)) return AE_NOT_EXIST; if (!block->handler)