2009-07-10 Bean <bean123ch@gmail.com>

2009-07-10  Robert Millan  <rmh.grub@aybabtu.com>

        * kern/ieee1275/openfw.c (grub_children_iterate)
        (grub_devalias_iterate): Fix size evaluation for property or path
        strings, which was broken since r2132.

diff --git a/ChangeLog b/ChangeLog
index 3fe273f639c6fddcf6c199a123de28695c28cf13..23c15d4c4edc0709592e18415fe80d508d9647a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-10  Bean  <bean123ch@gmail.com>
+2009-07-10  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * kern/ieee1275/openfw.c (grub_children_iterate)
+       (grub_devalias_iterate): Fix size evaluation for property or path
+       strings, which was broken since r2132.
+
 2009-07-07  Pavel Roskin  <proski@gnu.org>
 
        * commands/search.c (search_file): Merge into ...

diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index e7979f4ad33efd961d6d9ea84eb049493e0009ed..a952fe597de156c176956d2304b68a05c24eb2c7 100644 (file)
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -78,15 +78,15 @@ grub_children_iterate (char *devpath,
       grub_ssize_t actual;
 
       if (grub_ieee1275_get_property (child, "device_type", childtype,
-                                     sizeof childtype, &actual))
+                                     IEEE1275_MAX_PROP_LEN, &actual))
        continue;
 
-      if (grub_ieee1275_package_to_path (child, childpath, sizeof childpath,
-                                        &actual))
+      if (grub_ieee1275_package_to_path (child, childpath,
+                                        IEEE1275_MAX_PATH_LEN, &actual))
        continue;
 
       if (grub_ieee1275_get_property (child, "name", childname,
-                                     sizeof childname, &actual))
+                                     IEEE1275_MAX_PATH_LEN, &actual))
        continue;
 
       grub_sprintf (fullname, "%s/%s", devpath, childname);
@@ -176,7 +176,7 @@ grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
        }
 
       if (grub_ieee1275_get_property (dev, "device_type", devtype,
-                                     sizeof devtype, &actual))
+                                     IEEE1275_MAX_PROP_LEN, &actual))
        {
          /* NAND device don't have device_type property.  */
           devtype[0] = 0;