[src/trunk]: src/sys/arch/evbarm/evbarm Don't modify command line buffer but ...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5c4c1c517f0b
branches:  trunk
changeset: 343929:5c4c1c517f0b
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sat Mar 05 07:33:58 2016 +0000

description:
Don't modify command line buffer but create a copy of the root argument.

diffstat:

 sys/arch/evbarm/evbarm/autoconf.c |  30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r 7cc775c20c93 -r 5c4c1c517f0b sys/arch/evbarm/evbarm/autoconf.c
--- a/sys/arch/evbarm/evbarm/autoconf.c Sat Mar 05 06:48:31 2016 +0000
+++ b/sys/arch/evbarm/evbarm/autoconf.c Sat Mar 05 07:33:58 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.18 2014/11/22 11:10:22 mlelstv Exp $    */
+/*     $NetBSD: autoconf.c,v 1.19 2016/03/05 07:33:58 mlelstv Exp $    */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2014/11/22 11:10:22 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2016/03/05 07:33:58 mlelstv Exp $");
 
 #include "opt_md.h"
 
@@ -41,7 +41,7 @@
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 
 #include <machine/autoconf.h>
 #include <machine/intr.h>
@@ -95,10 +95,14 @@
 
 /* Set the rootdev variable from the root specifier in the boot args */
 
+static char *bootspec_buf = NULL;
+static size_t bootspec_buflen = 0;
+
 static void
 set_root_device(void)
 {
-       char *ptr, *end;
+       char *ptr, *end, *buf;
+       size_t len;
 
        if (boot_args == NULL)
                return;
@@ -112,12 +116,26 @@
        /* NUL-terminate string, get_bootconf_option doesn't */
        for (end=ptr; *end != '\0'; ++end) {
                if (*end == ' ' || *end == '\t') {
-                       *end = '\0';
                        break;
                }
        }
 
-       bootspec = ptr;
+       if (end == ptr)
+               return;
+
+       len = end - ptr;
+
+       buf = kmem_alloc(len + 1, KM_SLEEP);
+       memcpy(buf, ptr, len);
+       buf[len] = '\0';
+
+       if (bootspec_buf != NULL)
+               kmem_free(bootspec_buf, bootspec_buflen + 1);
+
+       bootspec_buf = buf;
+       bootspec_buflen = len;
+
+       bootspec = bootspec_buf;
 }
 #endif