Fri Aug 26 09:13:08 2011 UTC ()

Change aprint_verbose() to a normal printf() surrounded by #ifdef DIAGNOSTIC


(reinoud)

diff -r1.321 -r1.322 src/sys/kern/kern_exec.c

--- src/sys/kern/kern_exec.c 2011/08/26 09:07:48	1.321
+++ src/sys/kern/kern_exec.c 2011/08/26 09:13:08	1.322

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_exec.c,v 1.321 2011/08/26 09:07:48 reinoud Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.322 2011/08/26 09:13:08 reinoud Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -49,27 +49,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.321 2011/08/26 09:07:48 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.322 2011/08/26 09:13:08 reinoud Exp $");
 #include "opt_ktrace.h"
 #include "opt_modular.h"
 #include "opt_syscall_debug.h"
 #include "veriexec.h"
 #include "opt_pax.h"
 #include "opt_sa.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 @@ -362,47 +362,53 @@ check_exec(struct lwp *l, struct exec_pa
 	 * set up the vmcmds for creation of the process
 	 * address space
 	 */
 	error = ENOEXEC;
 	for (i = 0; i < nexecs; i++) {
 		int newerror;
 		epp->ep_esch = execsw[i];
 		newerror = (*execsw[i]->es_makecmds)(l, epp);
 		if (!newerror) {
 			/* Seems ok: check that entry point is not too high */
 			if (epp->ep_entry > VM_MAXUSER_ADDRESS) {
-				aprint_verbose("check_exec: rejecting due to "
+#ifdef DIAGNOSTIC
 				printf("check_exec: rejecting due to "
 					"too high entry address\n");
 #endif
 				error = ENOEXEC;
 				break;
+			}
 #ifdef VM_CHECK_MIN_ADDRESS
 			/* Seems ok: check that entry point is not too low */
 			if (epp->ep_entry < VM_MIN_ADDRESS) {
-				aprint_verbose("check_exec: rejecting due to "
+#ifdef DIAGNOSTIC
 				printf("check_exec: rejecting due to "
 					"too low entry address\n");
 #endif
 				error = ENOEXEC;
 				break;
+			}
 #endif
 			/* check limits */
 			if ((epp->ep_tsize > MAXTSIZ) ||
 			    (epp->ep_dsize > (u_quad_t)l->l_proc->p_rlimit
 						    [RLIMIT_DATA].rlim_cur)) {
-				aprint_verbose("check_exec: rejecting due to "
+#ifdef DIAGNOSTIC
 				printf("check_exec: rejecting due to "
 					"limits\n");
 #endif
 				error = ENOMEM;
 				break;
+			}
 			return 0;
+		}
 		if (epp->ep_emul_root != NULL) {
 			vrele(epp->ep_emul_root);
 			epp->ep_emul_root = NULL;
+		}
 		if (epp->ep_interp != NULL) {
 			vrele(epp->ep_interp);
 			epp->ep_interp = NULL;