From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757178AbYDRNyS (ORCPT ); Fri, 18 Apr 2008 09:54:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751849AbYDRNyJ (ORCPT ); Fri, 18 Apr 2008 09:54:09 -0400 Received: from yw-out-2324.google.com ([74.125.46.29]:62040 "EHLO yw-out-2324.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751380AbYDRNyH (ORCPT ); Fri, 18 Apr 2008 09:54:07 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; b=oW0yhX4c/HP1bJAnWkUSoFSuKEaXIhft6lHU11SrE43HDy40fsGwIzjti4hTztc1YYtmQJazxjHAuuw+2ZIibxVXtMCErGD2cOTTz3xIOqU37S06ZfFU1tDpvxRjWB72CjDTE7cLM7EfDV89a9vkkbxn0smI6OJimG9XP21K/8M= Date: Fri, 18 Apr 2008 17:53:19 +0400 From: Cyrill Gorcunov To: Pavel Machek Cc: bfields@fieldses.org, neilb@suse.de, ibm-acpi@hmh.eng.br, len.brown@intel.com, kkeil@suse.de, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [patch 3/3] ThinkPad ACPI: fix possible NULL pointer dereference Message-ID: <20080418135319.GC7674@cvg> References: <20080416174421.442716301@gmail.com>> <48063bc9.2533440a.1932.1fc1@mx.google.com> <20080418124111.GB4966@ucw.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080418124111.GB4966@ucw.cz> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [Pavel Machek - Fri, Apr 18, 2008 at 02:41:12PM +0200] | Hi! | | > Fix potential NULL pointer dereference if kstrdup failed | > | > Signed-off-by: Cyrill Gorcunov | > | > --- | > | > Index: linux-2.6.git/drivers/misc/thinkpad_acpi.c | > =================================================================== | > --- linux-2.6.git.orig/drivers/misc/thinkpad_acpi.c 2008-04-16 20:35:34.000000000 +0400 | > +++ linux-2.6.git/drivers/misc/thinkpad_acpi.c 2008-04-16 20:36:38.000000000 +0400 | > @@ -5826,7 +5826,7 @@ static void __init get_thinkpad_model_da | > | > tp->model_str = kstrdup(dmi_get_system_info(DMI_PRODUCT_VERSION), | > GFP_KERNEL); | > - if (strnicmp(tp->model_str, "ThinkPad", 8) != 0) { | > + if (tp->model_str && strnicmp(tp->model_str, "ThinkPad", 8) != 0) { | > kfree(tp->model_str); | > tp->model_str = NULL; | > } | | are you sure? This seems to assume machine is thinkpad if kstrdup | fails... which is very wrong. | Actually, my patch didn't bring any new into the current driver state, just add additional check to prevent NULL deref, that's all, so I think it's fine (but maybe additional printk with info would had been usefull). - Cyrill -