fix kernel oops in the redboot partition parser when CONFIG_MTD_REDBOOT_PARTS_UNALLOC...
authorFelix Fietkau <nbd@openwrt.org>
Sat, 26 Jul 2008 20:27:45 +0000 (20:27 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sat, 26 Jul 2008 20:27:45 +0000 (20:27 +0000)
SVN-Revision: 11948

target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch
target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch

index 2f31555884bbee04ac390d76e2ced703416cc3d1..b4d57cb535ffdadbe735406fd54ce6c683816ed6 100644 (file)
 +                              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;
index 2f31555884bbee04ac390d76e2ced703416cc3d1..b4d57cb535ffdadbe735406fd54ce6c683816ed6 100644 (file)
 +                              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;
index b473d59eca1a84a3930e184697a2cd7c0de3d18d..0f15bab3dd707b4675da1659252c756a21bef39c 100644 (file)
 +                              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;
index b473d59eca1a84a3930e184697a2cd7c0de3d18d..0f15bab3dd707b4675da1659252c756a21bef39c 100644 (file)
 +                              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;