From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765607AbZCNCB5 (ORCPT ); Fri, 13 Mar 2009 22:01:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755967AbZCNBWE (ORCPT ); Fri, 13 Mar 2009 21:22:04 -0400 Received: from kroah.org ([198.145.64.141]:35832 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755201AbZCNBVc (ORCPT ); Fri, 13 Mar 2009 21:21:32 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Fri Mar 13 18:10:47 2009 Message-Id: <20090314011047.425424026@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Fri, 13 Mar 2009 18:11:25 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org, Len Brown Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, linux-acpi@vger.kernel.org, Lin Ming , Henrique de Moraes Holschuh Subject: [patch 108/114] ACPI: fix broken usage of name.ascii References: <20090314010937.416083662@mini.kroah.org> Content-Disposition: inline; filename=acpi-fix-broken-usage-of-name.ascii.patch In-Reply-To: <20090314011649.GA26170@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.28-stable review patch. If anyone has any objections, please let us know. ------------------ From: Henrique de Moraes Holschuh This issue was fixed indirectly in mainline by commit 0175d562a29ad052c510782c7e76bc63d5155b9b. acpi_namespace_node's name.ascii field is four chars, and not NULL- terminated except by pure luck. So, it cannot be used by sscanf() without a length restriction. This is the minimal fix for both stable 2.6.27 and 2.6.28. Signed-off-by: Henrique de Moraes Holschuh Cc: Lin Ming Cc: Len Brown Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/ec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -759,9 +759,10 @@ acpi_ec_register_query_methods(acpi_hand struct acpi_namespace_node *node = handle; struct acpi_ec *ec = context; int value = 0; - if (sscanf(node->name.ascii, "_Q%x", &value) == 1) { + + if (sscanf(node->name.ascii, "_Q%2x", &value) == 1) acpi_ec_add_query_handler(ec, value, handle, NULL, NULL); - } + return AE_OK; }