svn commit: r340392 - head/sys/kern

[Kyle Evans]

Author: kevans
Date: Tue Nov 13 04:34:30 2018
New Revision: 340392
URL: https://svnweb.freebsd.org/changeset/base/340392

Log:
  Add dynamic_kenv assertion to init_static_kenv
  
  Both to formally document the requirement that this not be called after the
  dynamic kenv is setup, and to perhaps help static analyzers figure out
  what's going on. While calling init_static_kenv this late isn't fatal, there
  are some caveats that the caller should be aware of:
  
  - Late calls are effectively a no-op, as far as default FreeBSD is
  concerned, as everything will switch to searching the dynamic kenv once it's
  available.
  
  - Each of the kern_getenv calls will leak memory, as it's assumed that
  these are searching static environment and allocations will not be made.
  
  As such, this usage is not sensible and should be detected.

Modified:
  head/sys/kern/kern_environment.c

Modified: head/sys/kern/kern_environment.c
==============================================================================
--- head/sys/kern/kern_environment.c	Tue Nov 13 01:30:31 2018	(r340391)
+++ head/sys/kern/kern_environment.c	Tue Nov 13 04:34:30 2018	(r340392)
@@ -249,6 +249,7 @@ init_static_kenv(char *buf, size_t len)
 {
 	char *eval;
 
+	KASSERT(!dynamic_kenv, ("kenv: dynamic_kenv already initialized"));
 	/*
 	 * Give the static environment a chance to disable the loader(8)
 	 * environment first.  This is done with loader_env.disabled=1.