[kernel] r10546 - in dists/trunk/linux-2.6/debian/patches: bugfix/arm series

[Martin Michlmayr]

Author: tbm
Date: Thu Feb 14 12:01:17 2008
New Revision: 10546

Log:
needed for Orion


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/ignore-invalid-memtags.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/ignore-invalid-memtags.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/ignore-invalid-memtags.patch	Thu Feb 14 12:01:17 2008
@@ -0,0 +1,29 @@
+[PATCH] ARM: Ignore memory tags with invalid data
+
+From: Corey Minyard <minyard at acm.org>
+
+The DNS-323 system has several bogus memory entries in the tag table,
+and it caused the system to crash at startup.  Ignore tag entries that
+are obviously bogus.
+
+Signed-off-by: Corey Minyard <minyard at acm.org>
+
+diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
+index d3941a7..0bb917f 100644
+--- a/arch/arm/kernel/setup.c
++++ b/arch/arm/kernel/setup.c
+@@ -631,7 +631,12 @@ __tagtable(ATAG_CORE, parse_tag_core);
+ 
+ static int __init parse_tag_mem32(const struct tag *tag)
+ {
+-	if (meminfo.nr_banks >= NR_BANKS) {
++	/*
++	* Make sure that the memory size is non-zero, page aligned,
++	* and that it doesn't overflow the meminfo table.
++	*/
++	if (meminfo.nr_banks >= NR_BANKS || tag->u.mem.size & ~PAGE_MASK ||
++	   tag->u.mem.size == 0 || tag->u.mem.start & ~PAGE_MASK) {
+ 		printk(KERN_WARNING
+ 		       "Ignoring memory bank 0x%08x size %dKB\n",
+ 			tag->u.mem.start, tag->u.mem.size / 1024);
+

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Thu Feb 14 12:01:17 2008
@@ -30,3 +30,4 @@
 #the following will be fixed before 2.6.25 is out:
 + bugfix/sata_mv-dma.patch
 + bugfix/sata_mv-platform_driver.patch
++ bugfix/arm/ignore-invalid-memtags.patch