From patchwork Wed Mar 4 19:55:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 9909 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n24JuAr6023685 for ; Wed, 4 Mar 2009 19:56:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756160AbZCDT4R (ORCPT ); Wed, 4 Mar 2009 14:56:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756216AbZCDT4Q (ORCPT ); Wed, 4 Mar 2009 14:56:16 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:48086 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756207AbZCDT4N (ORCPT ); Wed, 4 Mar 2009 14:56:13 -0500 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n24JtUSj010554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 4 Mar 2009 11:55:31 -0800 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id n24JtUTS028013; Wed, 4 Mar 2009 11:55:30 -0800 Message-Id: <200903041955.n24JtUTS028013@imap1.linux-foundation.org> Subject: [patch 7/8] acpi: check for pxm_to_node_map overflow To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, akpm@linux-foundation.org, gorcunov@gmail.com, gorcunov@openvz.org From: akpm@linux-foundation.org Date: Wed, 04 Mar 2009 11:55:29 -0800 X-Spam-Status: No, hits=-3.453 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Cyrill Gorcunov It is hardly (if ever) possible but in case of broken _PXM entry we could reach out of pxm_to_node_map array bounds in acpi_map_pxm_to_node() call. Signed-off-by: Cyrill Gorcunov Cc: Len Brown Signed-off-by: Andrew Morton --- drivers/acpi/numa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/acpi/numa.c~acpi-check-for-pxm_to_node_map-overflow drivers/acpi/numa.c --- a/drivers/acpi/numa.c~acpi-check-for-pxm_to_node_map-overflow +++ a/drivers/acpi/numa.c @@ -277,7 +277,7 @@ int acpi_get_node(acpi_handle *handle) int pxm, node = -1; pxm = acpi_get_pxm(handle); - if (pxm >= 0) + if (pxm >= 0 && pxm < MAX_PXM_DOMAINS) node = acpi_map_pxm_to_node(pxm); return node;