From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 26 Jul 2008 20:27:45 +0000 (+0000)
Subject: fix kernel oops in the redboot partition parser when CONFIG_MTD_REDBOOT_PARTS_UNALLOC... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=129fcaffb31e53d5f21b4b77bfea84158d33fadf;p=openwrt%2Fstaging%2Fwigyori.git

fix kernel oops in the redboot partition parser when CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is set and there is some free space after the rootfs partition

SVN-Revision: 11948
---

diff --git a/target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch
index 2f31555884..b4d57cb535 100644
--- a/target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch
@@ -15,15 +15,15 @@
 +				parts[i].size = fl->next->img->flash_base;
 +				parts[i].size &= ~(master->erasesize - 1);
 +				parts[i].size -= parts[i].offset;
-+			}
 +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+			else {
++				nrparts--;
++			} else {
 +				i++;
 +				parts[i].offset = parts[i-1].size + parts[i-1].offset;
 +				parts[i].size = fl->next->img->flash_base - parts[i].offset;
 +				parts[i].name = nullname;
-+			}
  #endif
++			}
 +		}
  		tmp_fl = fl;
  		fl = fl->next;
diff --git a/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
index 2f31555884..b4d57cb535 100644
--- a/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
@@ -15,15 +15,15 @@
 +				parts[i].size = fl->next->img->flash_base;
 +				parts[i].size &= ~(master->erasesize - 1);
 +				parts[i].size -= parts[i].offset;
-+			}
 +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+			else {
++				nrparts--;
++			} else {
 +				i++;
 +				parts[i].offset = parts[i-1].size + parts[i-1].offset;
 +				parts[i].size = fl->next->img->flash_base - parts[i].offset;
 +				parts[i].name = nullname;
-+			}
  #endif
++			}
 +		}
  		tmp_fl = fl;
  		fl = fl->next;
diff --git a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
index b473d59eca..0f15bab3dd 100644
--- a/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
@@ -15,15 +15,15 @@
 +				parts[i].size = fl->next->img->flash_base;
 +				parts[i].size &= ~(master->erasesize - 1);
 +				parts[i].size -= parts[i].offset;
-+			}
 +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+			else {
++				nrparts--;
++			} else {
 +				i++;
 +				parts[i].offset = parts[i-1].size + parts[i-1].offset;
 +				parts[i].size = fl->next->img->flash_base - parts[i].offset;
 +				parts[i].name = nullname;
-+			}
  #endif
++			}
 +		}
  		tmp_fl = fl;
  		fl = fl->next;
diff --git a/target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch b/target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch
index b473d59eca..0f15bab3dd 100644
--- a/target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch
@@ -15,15 +15,15 @@
 +				parts[i].size = fl->next->img->flash_base;
 +				parts[i].size &= ~(master->erasesize - 1);
 +				parts[i].size -= parts[i].offset;
-+			}
 +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
-+			else {
++				nrparts--;
++			} else {
 +				i++;
 +				parts[i].offset = parts[i-1].size + parts[i-1].offset;
 +				parts[i].size = fl->next->img->flash_base - parts[i].offset;
 +				parts[i].name = nullname;
-+			}
  #endif
++			}
 +		}
  		tmp_fl = fl;
  		fl = fl->next;