From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755881Ab0IWRZf (ORCPT ); Thu, 23 Sep 2010 13:25:35 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:52813 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754493Ab0IWRZd (ORCPT ); Thu, 23 Sep 2010 13:25:33 -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=dXN/esVEstawdJ5vW+0rrsns0NPx02rGTRb8+luBbxr8kgY4VZHMdMXx3286u/XZLg hhe4pOrk1o2w0CeSEWsbWlbDc1Zi2rfPl/Z99e6MqxdVFeuYqIMIlSTcQkSRPtDCDHla pBy8tvQvAfbVDRYe1WdZaSrPcT8l/CaNlj6/Y= Date: Thu, 23 Sep 2010 19:24:22 +0200 From: Marcin Slusarz To: Andrew Morton Cc: Mauro Carvalho Chehab , LKML , linux-edac@vger.kernel.org, Doug Thompson , Doug Thompson Subject: [PATCH resend] i7core_edac: fix panic in udimm sysfs attributes registration Message-ID: <20100923172422.GA18958@joi.lan> References: <20100914162602.GA6047@joi.lan> <216309.52558.qm@web50108.mail.re2.yahoo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <216309.52558.qm@web50108.mail.re2.yahoo.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Array of udimm sysfs attributes was not ended with NULL marker, leading to dereference of random memory. EDAC DEBUG: edac_create_mci_instance_attributes: edac_create_mci_instance_attributes() file udimm0 EDAC DEBUG: edac_create_mci_instance_attributes: edac_create_mci_instance_attributes() file udimm1 EDAC DEBUG: edac_create_mci_instance_attributes: edac_create_mci_instance_attributes() file udimm2 BUG: unable to handle kernel NULL pointer dereference at 00000000000001a4 IP: [] edac_create_mci_instance_attributes+0x148/0x1f1 PGD 0 Oops: 0000 [#1] PREEMPT SMP last sysfs file: CPU 3 Modules linked in: Pid: 1, comm: swapper Not tainted 2.6.36-rc3-nv+ #483 P6T SE/System Product Name RIP: 0010:[] [] edac_create_mci_instance_attributes+0x148/0x1f1 (...) Call Trace: [] edac_create_mci_instance_attributes+0x198/0x1f1 [] edac_create_sysfs_mci_device+0xbb/0x2b2 [] edac_mc_add_mc+0x46b/0x557 [] i7core_probe+0xccf/0xec0 [] local_pci_probe+0x12/0x16 [] pci_device_probe+0x60/0x8f [] ? driver_sysfs_add+0x6b/0x90 [] driver_probe_device+0xa7/0x136 [] __driver_attach+0x58/0x7c [] ? __driver_attach+0x0/0x7c [] bus_for_each_dev+0x4e/0x83 [] driver_attach+0x19/0x1b [] bus_add_driver+0x12b/0x277 [] driver_register+0x99/0x10a [] __pci_register_driver+0x63/0xd3 [] i7core_init+0x9a/0xbb [] ? i7core_init+0x0/0xbb [] do_one_initcall+0x7a/0x12e [] kernel_init+0x143/0x1cc [] kernel_thread_helper+0x4/0x10 [] ? restore_args+0x0/0x30 [] ? kernel_init+0x0/0x1cc [] ? kernel_thread_helper+0x0/0x10 Code: 24 49 89 44 24 08 4c 89 20 48 8b 43 10 4d 89 74 24 58 49 89 44 24 50 83 3d d7 13 53 00 00 78 22 48 8b 43 10 48 c7 c2 90 7e 66 81 <48> 8b 08 4d 89 f0 48 89 d6 48 c7 c7 7e a9 79 81 31 c0 e8 21 10 RIP [] edac_create_mci_instance_attributes+0x148/0x1f1 RSP CR2: 00000000000001a4 ---[ end trace 20de320855b81d78 ]--- Kernel panic - not syncing: Attempted to kill init! Signed-off-by: Marcin Slusarz Cc: stable@kernel.org Cc: Mauro Carvalho Chehab Acked-by: Doug Thompson --- drivers/edac/i7core_edac.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index e0187d1..0fd5b85 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c @@ -1140,6 +1140,7 @@ static struct mcidev_sysfs_attribute i7core_udimm_counters_attrs[] = { ATTR_COUNTER(0), ATTR_COUNTER(1), ATTR_COUNTER(2), + { .attr = { .name = NULL } } }; static struct mcidev_sysfs_group i7core_udimm_counters = { -- 1.7.2.3