Bugfix to patch-83

* Correct dereference of NULL in RAID partition patch (patch-83).
  (Patch from Dustin).
git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-85

diff --git a/0arch-timestamps0 b/0arch-timestamps0
index 84bd38c7ddf3299afed0560f6866294c493ef179..0df6c4d898ca00961297e9b5c8d77ded599c68df 100644 (file)
--- a/0arch-timestamps0
+++ b/0arch-timestamps0
@@ -1,7 +1,7 @@
-./0arch-timestamps0    1120953079      1122611350
+./0arch-timestamps0    1122611358      1123038744
 ./BUGS 1109049412      1000991730
 ./COPYING      1109049412      1000991730
-./ChangeLog    1122611216      1122611345
+./ChangeLog    1123038655      1123038742
 ./Config       1109049412      1002101497
 ./INSTALL      1109049412      1000991730
 ./Makefile     1109049412      1089576723
@@ -22,18 +22,18 @@
 ./doc/examples/simpleboot.chrp 1109049412      1068017750
 ./doc/examples/yaboot.conf.multi-boot  1109049412      1006348765
 ./doc/examples/yaboot.conf.rs6000      1109049412      1006348765
-./doc/examples 1122611349      1068017750
+./doc/examples 1123038743      1068017750
 ./doc/yaboot-howto.de.sgml     1109049413      1096186109
 ./doc/yaboot-howto.sgml        1109049413      1096186082
-./doc  1122611349      1096186109
+./doc  1123038743      1096186109
 ./etc/yaboot.conf      1109049413      1006348765
-./etc  1122611349      1007269243
+./etc  1123038743      1007269243
 ./first/ofboot 1118285749      1065311880
-./first        1122611349      1071492158
+./first        1123038743      1071492158
 ./include/asm/elf.h    1109049413      1000991730
 ./include/asm/ppc_asm.tmpl     1109049413      1000991730
 ./include/asm/processor.h      1109049413      1000991730
-./include/asm  1122611349      1007269243
+./include/asm  1123038743      1007269243
 ./include/bootinfo.h   1109049413      1007200690
 ./include/byteorder.h  1109049413      1000991730
 ./include/cfg.h        1109049413      1007200690
@@ -42,12 +42,12 @@
 ./include/debug.h      1109049413      1007200690
 ./include/errors.h     1109049413      1007200690
 ./include/et/com_err.h 1109049413      1000991731
-./include/et   1122611349      1007269243
+./include/et   1123038743      1007269243
 ./include/ext2fs/bitops.h      1109049413      1003927524
 ./include/ext2fs/ext2_err.h    1109049413      1003927524
 ./include/ext2fs/ext2_io.h     1109049413      1003927524
 ./include/ext2fs/ext2fs.h      1109049413      1003927524
-./include/ext2fs       1122611350      1007269243
+./include/ext2fs       1123038744      1007269243
 ./include/file.h       1109049413      1007200690
 ./include/fs.h 1109049413      1007200690
 ./include/linux/elf.h  1109049413      1000991731
@@ -55,12 +55,12 @@
 ./include/linux/iso_fs.h       1109049413      1000991731
 ./include/linux/stat.h 1109049413      1000991731
 ./include/linux/types.h        1109049413      1000991731
-./include/linux        1122611350      1007269243
+./include/linux        1123038744      1007269243
 ./include/mac-part.h   1109049413      1007200690
 ./include/md5.h        1109049413      1000991730
 ./include/prom.h       1109049413      1007200690
 ./include/reiserfs/reiserfs.h  1109049413      1025684115
-./include/reiserfs     1122611350      1025684115
+./include/reiserfs     1123038744      1025684115
 ./include/setjm2.h     1109049413      1000991730
 ./include/setjmp.h     1109049413      1000991730
 ./include/stdlib.h     1109049413      1000991730
@@ -68,12 +68,12 @@
 ./include/swab.h       1109049413      1000991730
 ./include/types.h      1109049413      1000991730
 ./include/xfs/xfs.h    1109049413      1002101334
-./include/xfs  1122611350      1007269244
+./include/xfs  1123038744      1007269244
 ./include/yaboot.h     1109049413      1007200690
 ./include/amiga-part.h 1116558586      1116558522
 ./include/fdisk-part.h 1120953080      1120952841
 ./include/partition.h  1120953080      1120952841
-./include      1122611349      1120952841
+./include      1123038743      1120952841
 ./lib/ctype.c  1109049413      1000991731
 ./lib/libext2fs.a      1109049413      1003927524
 ./lib/malloc.c 1122610545      1007200690
@@ -82,15 +82,15 @@
 ./lib/strtol.c 1109049413      1000991731
 ./lib/vsprintf.c       1109049413      1000991731
 ./lib/strstr.c 1119929028      1116476589
-./lib  1122610543      1116476589
+./lib  1123038744      1116476589
 ./man/bootstrap.8      1116558691      1000991731
 ./man/mkofboot.8       1116558691      1006348765
 ./man/ofpath.8 1116558691      1000991731
 ./man/yaboot.conf.5    1116558691      1004256691
 ./man/yabootconfig.8   1116558691      1027929577
 ./man/ybin.8   1116558691      1006348765
-./man/yaboot.8 1121662318      1090699543
-./man  1122611350      1116476667
+./man/yaboot.8 1122619111      1090699543
+./man  1123038744      1116476667
 ./man.patch    1116558699      1006348761
 ./second/cache.S       1120952570      1007200690
 ./second/cfg.c 1120952570      1007200690
@@ -105,17 +105,17 @@
 ./second/md5.c 1120952570      1032059532
 ./second/prom.c        1120952570      1067937197
 ./second/setjmp.S      1120952570      1000991732
-./second/fs_of.c       1120953080      1120952841
-./second/file.c        1122611207      1122611207
-./second/partition.c   1122611207      1122611207
-./second/yaboot.c      1122611207      1122611207
-./second       1122611350      1122611207
+./second/file.c        1122611358      1122611207
+./second/partition.c   1122611358      1122611207
+./second/yaboot.c      1122611358      1122611207
+./second/fs_of.c       1123038648      1123038648
+./second       1123038744      1123038648
 ./util/elfextract.c    1109049413      1007303237
 ./util/addnote.c       1109049413      1107321884
-./util 1122611350      1107321884
-./ybin/mkofboot        1122611350      1073219938
+./util 1123038744      1107321884
+./ybin/mkofboot        1123038744      1073219938
 ./ybin/ofpath  1120448537      1120448442
 ./ybin/yabootconfig    1117166139      1089576743
 ./ybin/ybin    1120448039      1120447943
-./ybin 1122611350      1120448442
-.      1122611349      1122611345
+./ybin 1123038744      1120448442
+.      1123038743      1123038741

diff --git a/ChangeLog b/ChangeLog
index 7002c5d9a95c33d93976120dde9c4f58653978ef..419af42bb16833df2005f875e6fe26a18b3c01b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
 #
 
+2005-08-03 03:12:29 GMT        Ethan Benson <erbenson@alaska.net>      patch-85
+
+    Summary:
+      Bugfix to patch-83
+    Revision:
+      yaboot--devel--1.3--patch-85
+
+    * Correct dereference of NULL in RAID partition patch (patch-83).
+      (Patch from Dustin).
+
+    modified files:
+     0arch-timestamps0 ChangeLog second/fs_of.c
+
+
 2005-07-29 04:29:18 GMT        Ethan Benson <erbenson@alaska.net>      patch-84
 
     Summary:

diff --git a/second/fs_of.c b/second/fs_of.c
index 7a22117b2e6f41176f7feaf583e95e3d87c091f2..e7b37bdd05742c915125cf787c611d2b49a1fb01 100644 (file)
--- a/second/fs_of.c
+++ b/second/fs_of.c
@@ -90,16 +90,14 @@ of_open(struct boot_file_t* file, const char* dev_name,
      DEBUG_ENTER;
      DEBUG_OPEN;
 
-     if (part->sys_ind == LINUX_RAID)
-     {
-         DEBUG_F("skipping because partition is marked LINUX_RAID\n");
-         DEBUG_LEAVE(FILE_ERR_BAD_FSYS);
-         return FILE_ERR_BAD_FSYS;
-     }
-
      strncpy(buffer, dev_name, 768);
      strcat(buffer, ":");
      if (part) {
+          if (part->sys_ind == LINUX_RAID) {
+              DEBUG_F("skipping because partition is marked LINUX_RAID\n");
+              DEBUG_LEAVE(FILE_ERR_BAD_FSYS);
+              return FILE_ERR_BAD_FSYS;
+         }
          char pn[3];
          sprintf(pn, "%02d", part->part_number);
          strcat(buffer, pn);