Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/kern fix this properly.
details: https://anonhg.NetBSD.org/src/rev/2fa2163f773e
branches: trunk
changeset: 344433:2fa2163f773e
user: macallan <macallan%NetBSD.org@localhost>
date: Mon Mar 28 16:45:44 2016 +0000
description:
fix this properly.
uap is supposed to hold init's argv[], so it's 3 * sizeof(char *), the bug
was to copyout(..., sizeof(args)) which is an array of syscallargs, not argv
*
diffstat:
sys/kern/init_main.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (36 lines):
diff -r 06f1d41c6153 -r 2fa2163f773e sys/kern/init_main.c
--- a/sys/kern/init_main.c Mon Mar 28 15:45:18 2016 +0000
+++ b/sys/kern/init_main.c Mon Mar 28 16:45:44 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.478 2016/03/28 15:45:18 macallan Exp $ */
+/* $NetBSD: init_main.c,v 1.479 2016/03/28 16:45:44 macallan Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.478 2016/03/28 15:45:18 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.479 2016/03/28 16:45:44 macallan Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -1035,7 +1035,7 @@
* Move out the arg pointers.
*/
ucp = (void *)STACK_ALIGN(ucp, STACK_ALIGNBYTES);
- uap = (char **)STACK_ALLOC(ucp, sizeof(args));
+ uap = (char **)STACK_ALLOC(ucp, sizeof(argv));
SCARG(&args, path) = arg0;
SCARG(&args, argp) = uap;
SCARG(&args, envp) = NULL;
@@ -1044,7 +1044,7 @@
argv[0] = slash ? arg0 + (slash + 1 - path) : arg0;
argv[1] = arg1;
argv[2] = NULL;
- if ((error = copyout(argv, uap, sizeof(args))) != 0)
+ if ((error = copyout(argv, uap, sizeof(argv))) != 0)
goto copyerr;
/*
Home |
Main Index |
Thread Index |
Old Index