From: robertmh <robertmh@localhost>
Date: Fri, 10 Jul 2009 20:19:08 +0000 (+0000)
Subject: 2009-07-10  Bean  <bean123ch@gmail.com>
X-Git-Tag: 1.98~721
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ae1bf88be5627dab6e1810e8e634da8fe32edf1;p=thirdparty%2Fgrub.git

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 3fe273f63..23c15d4c4 100644
--- 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 e7979f4ad..a952fe597 100644
--- 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;