KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 11948
This commit is contained in:
Felix Fietkau 2008-07-26 20:27:45 +00:00
parent c385ca9c81
commit 129fcaffb3
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/generic-2.6/patches-2.6.23/070-redboot_space.patch
View file

@ -15,15 +15,15 @@
+ parts[i].size = fl->next->img->flash_base; + parts[i].size = fl->next->img->flash_base;
+ parts[i].size &= ~(master->erasesize - 1); + parts[i].size &= ~(master->erasesize - 1);
+ parts[i].size -= parts[i].offset; + parts[i].size -= parts[i].offset;
+ }
+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+ else { + nrparts--;
+ } else {
+ i++; + i++;
+ parts[i].offset = parts[i-1].size + parts[i-1].offset; + parts[i].offset = parts[i-1].size + parts[i-1].offset;
+ parts[i].size = fl->next->img->flash_base - parts[i].offset; + parts[i].size = fl->next->img->flash_base - parts[i].offset;
+ parts[i].name = nullname; + parts[i].name = nullname;
+ }
#endif #endif
+ }
+ } + }
tmp_fl = fl; tmp_fl = fl;
fl = fl->next; fl = fl->next;

6
target/linux/generic-2.6/patches-2.6.24/070-redboot_space.patch
View file

@ -15,15 +15,15 @@
+ parts[i].size = fl->next->img->flash_base; + parts[i].size = fl->next->img->flash_base;
+ parts[i].size &= ~(master->erasesize - 1); + parts[i].size &= ~(master->erasesize - 1);
+ parts[i].size -= parts[i].offset; + parts[i].size -= parts[i].offset;
+ }
+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+ else { + nrparts--;
+ } else {
+ i++; + i++;
+ parts[i].offset = parts[i-1].size + parts[i-1].offset; + parts[i].offset = parts[i-1].size + parts[i-1].offset;
+ parts[i].size = fl->next->img->flash_base - parts[i].offset; + parts[i].size = fl->next->img->flash_base - parts[i].offset;
+ parts[i].name = nullname; + parts[i].name = nullname;
+ }
#endif #endif
+ }
+ } + }
tmp_fl = fl; tmp_fl = fl;
fl = fl->next; fl = fl->next;

6
target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
View file

@ -15,15 +15,15 @@
+ parts[i].size = fl->next->img->flash_base; + parts[i].size = fl->next->img->flash_base;
+ parts[i].size &= ~(master->erasesize - 1); + parts[i].size &= ~(master->erasesize - 1);
+ parts[i].size -= parts[i].offset; + parts[i].size -= parts[i].offset;
+ }
+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+ else { + nrparts--;
+ } else {
+ i++; + i++;
+ parts[i].offset = parts[i-1].size + parts[i-1].offset; + parts[i].offset = parts[i-1].size + parts[i-1].offset;
+ parts[i].size = fl->next->img->flash_base - parts[i].offset; + parts[i].size = fl->next->img->flash_base - parts[i].offset;
+ parts[i].name = nullname; + parts[i].name = nullname;
+ }
#endif #endif
+ }
+ } + }
tmp_fl = fl; tmp_fl = fl;
fl = fl->next; fl = fl->next;

6
target/linux/generic-2.6/patches-2.6.26/070-redboot_space.patch
View file

@ -15,15 +15,15 @@
+ parts[i].size = fl->next->img->flash_base; + parts[i].size = fl->next->img->flash_base;
+ parts[i].size &= ~(master->erasesize - 1); + parts[i].size &= ~(master->erasesize - 1);
+ parts[i].size -= parts[i].offset; + parts[i].size -= parts[i].offset;
+ }
+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED +#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+ else { + nrparts--;
+ } else {
+ i++; + i++;
+ parts[i].offset = parts[i-1].size + parts[i-1].offset; + parts[i].offset = parts[i-1].size + parts[i-1].offset;
+ parts[i].size = fl->next->img->flash_base - parts[i].offset; + parts[i].size = fl->next->img->flash_base - parts[i].offset;
+ parts[i].name = nullname; + parts[i].name = nullname;
+ }
#endif #endif
+ }
+ } + }
tmp_fl = fl; tmp_fl = fl;
fl = fl->next; fl = fl->next;