svn commit: r253235 - stable/9/sbin/route

[Hiroki Sato]

Author: hrs
Date: Fri Jul 12 01:25:24 2013
New Revision: 253235
URL: http://svnweb.freebsd.org/changeset/base/253235

Log:
  MFC 244325:
  
  - Fix strtol() error handling.
  - Add a range condition of given FIB number and the related error messages.
  - Fix free() problem.

Modified:
  stable/9/sbin/route/route.c
Directory Properties:
  stable/9/sbin/route/   (props changed)

Modified: stable/9/sbin/route/route.c
==============================================================================
--- stable/9/sbin/route/route.c Fri Jul 12 01:23:41 2013        (r253234)
+++ stable/9/sbin/route/route.c Fri Jul 12 01:25:24 2013        (r253235)
@@ -260,19 +260,25 @@ static int
 fiboptlist_range(const char *arg, struct fibl_head_t *flh)
 {
        struct fibl *fl;
-       char *str, *token, *endptr;
+       char *str0, *str, *token, *endptr;
        int fib[2], i, error;
 
-       str = strdup(arg);
+       str0 = str = strdup(arg);
        error = 0;
        i = 0;
        while ((token = strsep(&str, "-")) != NULL) {
                switch (i) {
                case 0:
                case 1:
+                       errno = 0;
                        fib[i] = strtol(token, &endptr, 0);
-                       if (*endptr != '\0' || (fib[i] == 0 &&
-                           (errno == EINVAL || errno == ERANGE)))
+                       if (errno == 0) {
+                               if (*endptr != '\0' ||
+                                   fib[i] < 0 ||
+                                   (numfibs != -1 && fib[i] > numfibs - 1)) 
+                                       errno = EINVAL;
+                       }
+                       if (errno)
                                error = 1;
                        break;
                default:
@@ -296,7 +302,7 @@ fiboptlist_range(const char *arg, struct
                TAILQ_INSERT_TAIL(flh, fl, fl_next);
        }
 fiboptlist_range_ret:
-       free(str);
+       free(str0);
        return (error);
 }
 
@@ -305,7 +311,7 @@ static int
 fiboptlist_csv(const char *arg, struct fibl_head_t *flh)
 {
        struct fibl *fl;
-       char *str, *token, *endptr;
+       char *str0, *str, *token, *endptr;
        int fib, error;
 
        if (strcmp("all", arg) == 0) {
@@ -319,14 +325,14 @@ fiboptlist_csv(const char *arg, struct f
                else
                        snprintf(str, ALLSTRLEN - 1, "%d", 0);
        } else if (strcmp("default", arg) == 0) {
-               str = calloc(1, ALLSTRLEN);
+               str0 = str = calloc(1, ALLSTRLEN);
                if (str == NULL) {
                        error = 1;
                        goto fiboptlist_csv_ret;
                }
                snprintf(str, ALLSTRLEN - 1, "%d", defaultfib);
        } else
-               str = strdup(arg);
+               str0 = str = strdup(arg);
 
        error = 0;
        while ((token = strsep(&str, ",")) != NULL) {
@@ -335,9 +341,15 @@ fiboptlist_csv(const char *arg, struct f
                        if (error)
                                goto fiboptlist_csv_ret;
                } else {
+                       errno = 0;
                        fib = strtol(token, &endptr, 0);
-                       if (*endptr != '\0' || (fib == 0 &&
-                           (errno == EINVAL || errno == ERANGE))) {
+                       if (errno == 0) {
+                               if (*endptr != '\0' ||
+                                   fib < 0 ||
+                                   (numfibs != -1 && fib > numfibs - 1))
+                                       errno = EINVAL;
+                       }
+                       if (errno) {
                                error = 1;
                                goto fiboptlist_csv_ret;
                        }
@@ -351,7 +363,7 @@ fiboptlist_csv(const char *arg, struct f
                }
        }
 fiboptlist_csv_ret:
-       free(str);
+       free(str0);
        return (error);
 }
 
@@ -396,7 +408,7 @@ flushroutes(int argc, char *argv[])
                                usage(*argv);
                        error = fiboptlist_csv(*++argv, &fibl_head);
                        if (error)
-                               usage(*argv);
+                               errx(EX_USAGE, "invalid fib number: %s", *argv);
                        break;
                default:
                        usage(*argv);
@@ -861,7 +873,8 @@ newroute(int argc, char **argv)
                                        usage(NULL);
                                error = fiboptlist_csv(*++argv, &fibl_head);
                                if (error)
-                                       usage(NULL);
+                                       errx(EX_USAGE,
+                                           "invalid fib number: %s", *argv);
                                break;
                        case K_IFA:
                                if (!--argc)
@@ -1443,10 +1456,16 @@ monitor(int argc, char *argv[])
                case K_FIB:
                        if (!--argc)
                                usage(*argv);
+                       errno = 0;
                        fib = strtol(*++argv, &endptr, 0);
-                       if (*endptr != '\0' || (fib == 0 &&
-                           (errno == EINVAL || errno == ERANGE)))
-                               usage(*argv);
+                       if (errno == 0) {
+                               if (*endptr != '\0' ||
+                                   fib < 0 ||
+                                   (numfibs != -1 && fib > numfibs - 1))
+                                       errno = EINVAL;
+                       }
+                       if (errno)
+                               errx(EX_USAGE, "invalid fib number: %s", *argv);
                        break;
                default:
                        usage(*argv);
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"