xnu-1228.7.58.tar.gz

[apple/xnu.git] / pexpert / gen / bootargs.c

diff --git a/pexpert/gen/bootargs.c b/pexpert/gen/bootargs.c
index 73b65b9978c7958aeb204a2bd344674ea717a143..1d9fd94bd72b0c4d4b48295d69088d5767179480 100644 (file)
--- a/pexpert/gen/bootargs.c
+++ b/pexpert/gen/bootargs.c
@@ -31,6 +31,8 @@ extern boolean_t isargsep( char c);
 extern int argstrcpy(char *from, char *to);
 extern int getval(char *s, int *val);
 
+static int argstrcpy2(char *from,char *to, unsigned maxlen);
+
 #define        NUM     0
 #define        STR     1
 
@@ -39,7 +41,14 @@ PE_parse_boot_arg(
        const char  *arg_string,
        void            *arg_ptr)
 {
-       return PE_parse_boot_argn(arg_string, arg_ptr, -1);
+       int max_len = -1;
+
+#if CONFIG_EMBEDDED
+       /* Limit arg size to 4 byte when no size is given */
+       max_len = 4;
+#endif
+
+       return PE_parse_boot_argn(arg_string, arg_ptr, max_len);
 }
 
 boolean_t
@@ -50,7 +59,7 @@ PE_parse_boot_argn(
 {
        char *args;
        char *cp, c;
-       int i;
+       unsigned int i;
        int val;
        boolean_t arg_boolean;
        boolean_t arg_found;
@@ -94,8 +103,8 @@ PE_parse_boot_argn(
                        }
                        if ('_' == *arg_string) /* Force a string copy if the argument name begins with an underscore */
                        {
-                               int hacklen = 16 > max_len ? 16 : max_len;
-                               argstrcpy2 (++cp, (char *)arg_ptr, hacklen); /* Hack - terminate after 16 characters */
+                               int hacklen = 17 > max_len ? 17 : max_len;
+                               argstrcpy2 (++cp, (char *)arg_ptr, hacklen - 1); /* Hack - terminate after 16 characters */
                                arg_found = TRUE;
                                break;
                        }
@@ -107,7 +116,7 @@ PE_parse_boot_argn(
                                        break;
                                case STR:
                                        if(max_len > 0) //max_len of 0 performs no copy at all
-                                               argstrcpy2(++cp, (char *)arg_ptr, max_len);
+                                               argstrcpy2(++cp, (char *)arg_ptr, max_len - 1);
                                        else if(max_len == -1)
                                                argstrcpy(++cp, (char *)arg_ptr);
                                        arg_found = TRUE;
@@ -150,13 +159,13 @@ argstrcpy(
        return(i);
 }
 
-int
+static int
 argstrcpy2(
        char *from, 
        char *to,
        unsigned maxlen)
 {
-       int i = 0;
+       unsigned int i = 0;
 
        while (!isargsep(*from) && i < maxlen) {
                i++;
@@ -171,8 +180,8 @@ getval(
        char *s, 
        int *val)
 {
-       register unsigned radix, intval;
-       register unsigned char c;
+       unsigned int radix, intval;
+    unsigned char c;
        int sign = 1;
 
        if (*s == '=') {
@@ -181,7 +190,7 @@ getval(
                        sign = -1, s++;
                intval = *s++-'0';
                radix = 10;
-               if (intval == 0)
+               if (intval == 0) {
                        switch(*s) {
 
                        case 'x':
@@ -205,28 +214,44 @@ getval(
                                if (!isargsep(*s))
                                        return (STR);
                        }
+                } else if (intval >= radix) {
+                    return (STR);
+                }
                for(;;) {
-                       if (((c = *s++) >= '0') && (c <= '9'))
+                        c = *s++;
+                        if (isargsep(c))
+                            break;
+                        if ((radix <= 10) &&
+                            ((c >= '0') && (c <= ('9' - (10 - radix))))) {
+                                c -= '0';
+                        } else if ((radix == 16) &&
+                                   ((c >= '0') && (c <= '9'))) {
                                c -= '0';
-                       else if ((c >= 'a') && (c <= 'f'))
+                        } else if ((radix == 16) &&
+                                   ((c >= 'a') && (c <= 'f'))) {
                                c -= 'a' - 10;
-                       else if ((c >= 'A') && (c <= 'F'))
+                        } else if ((radix == 16) &&
+                                   ((c >= 'A') && (c <= 'F'))) {
                                c -= 'A' - 10;
-                       else if (c == 'k' || c == 'K')
-                               { sign *= 1024; break; }
-                       else if (c == 'm' || c == 'M')
-                               { sign *= 1024 * 1024; break; }
-                       else if (c == 'g' || c == 'G')
-                               { sign *= 1024 * 1024 * 1024; break; }
-                       else if (isargsep(c))
+                        } else if (c == 'k' || c == 'K') {
+                               sign *= 1024;
                                break;
-                       else
+                       } else if (c == 'm' || c == 'M') {
+                               sign *= 1024 * 1024;
+                                break;
+                       } else if (c == 'g' || c == 'G') {
+                               sign *= 1024 * 1024 * 1024;
+                                break;
+                       } else {
                                return (STR);
+                        }
                        if (c >= radix)
                                return (STR);
                        intval *= radix;
                        intval += c;
                }
+                if (!isargsep(c) && !isargsep(*s))
+                    return STR;
                *val = intval * sign;
                return (NUM);
        }