diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 7830f2188c40..0d19f0670e2a 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.143 2019/12/31 13:07:13 ad Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.144 2020/01/21 15:25:38 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.143 2019/12/31 13:07:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.144 2020/01/21 15:25:38 christos Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -62,6 +62,10 @@ struct vm_map *module_map;
 const char *module_machine;
 char	module_base[MODULE_BASE_SIZE];
 
+#ifndef MODULE_NOAUTOLOAD
+#define MODULE_NOAUTOLOAD "compat_linux* filemon"
+#endif
+
 struct modlist        module_list = TAILQ_HEAD_INITIALIZER(module_list);
 struct modlist        module_builtins = TAILQ_HEAD_INITIALIZER(module_builtins);
 static struct modlist module_bootlist = TAILQ_HEAD_INITIALIZER(module_bootlist);
@@ -94,6 +98,7 @@ u_int		module_autotime = 10;
 u_int		module_gen = 1;
 static kcondvar_t module_thread_cv;
 static kmutex_t module_thread_lock;
+static kmutex_t module_noautoload_lock;
 static int	module_thread_ticks;
 int (*module_load_vfs_vec)(const char *, int, bool, module_t *,
 			   prop_dictionary_t *) = (void *)eopnotsupp;
@@ -121,12 +126,14 @@ static module_t	*module_lookup(const char *);
 static void	module_enqueue(module_t *);
 
 static bool	module_merge_dicts(prop_dictionary_t, const prop_dictionary_t);
+static bool	module_allow_autoload(const char *);
 
 static void	sysctl_module_setup(void);
 static int	sysctl_module_autotime(SYSCTLFN_PROTO);
 
 static void	module_callback_load(struct module *);
 static void	module_callback_unload(struct module *);
+static void	module_noautoload(const char *);
 
 #define MODULE_CLASS_MATCH(mi, modclass) \
 	((modclass) == MODULE_CLASS_ANY || (modclass) == (mi)->mi_class)
@@ -413,6 +420,7 @@ module_init(void)
 	}
 	cv_init(&module_thread_cv, "mod_unld");
 	mutex_init(&module_thread_lock, MUTEX_DEFAULT, IPL_NONE);
+	mutex_init(&module_noautoload_lock, MUTEX_DEFAULT, IPL_NONE);
 	TAILQ_INIT(&modcblist);
 
 #ifdef MODULAR	/* XXX */
@@ -445,6 +453,7 @@ module_init(void)
 	module_netbsd = module_newmodule(MODULE_SOURCE_KERNEL);
 	module_netbsd->mod_refcnt = 1;
 	module_netbsd->mod_info = &module_netbsd_modinfo;
+	module_noautoload(MODULE_NOAUTOLOAD);
 }
 
 /*
@@ -504,6 +513,67 @@ sysctl_module_autotime(SYSCTLFN_ARGS)
 	return (0);
 }
 
+static char noautoload_buf[1024];
+static char *noautoload_ebuf;
+
+static void
+module_noautoload(const char *pat)
+{
+	const unsigned char *p = (const unsigned char *)pat;
+	unsigned char *q = (unsigned char *)noautoload_buf;
+
+	mutex_enter(&module_noautoload_lock);
+
+	*q = '\0';
+	while (*p) {
+		while (*p && isspace(*p)) p++;
+		while (*p && !isspace(*p)) *q++ = *p++;
+		*q++ = '\0';
+	}
+	noautoload_ebuf = q;
+
+	mutex_exit(&module_noautoload_lock);
+}
+
+static bool
+module_allow_autoload(const char *name)
+{
+	const char *p;
+
+	mutex_enter(&module_noautoload_lock);
+	for (p = noautoload_buf; p < noautoload_ebuf; p += strlen(p) + 1) {
+		if (pmatch(name, p, NULL) > 0) {
+			mutex_exit(&module_noautoload_lock);
+			return false;
+		}
+	}
+	mutex_exit(&module_noautoload_lock);
+	return true;
+}
+
+static int
+sysctl_module_noautoload(SYSCTLFN_ARGS)
+{
+	struct sysctlnode node;
+	int error;
+	char newbuf[sizeof(noautoload_buf)];
+
+	node = *rnode;
+	node.sysctl_data = newbuf;
+	node.sysctl_size = sizeof(newbuf);
+
+	error = sysctl_lookup(SYSCTLFN_CALL(&node));
+	if (error || newp == NULL)
+		return error;
+
+	if (strlen(newbuf) + 1 > sizeof(noautoload_buf))
+		return ENOSPC;
+
+	module_noautoload(newbuf);
+
+	return 0;
+}
+
 static void
 sysctl_module_setup(void)
 {
@@ -543,6 +613,12 @@ sysctl_module_setup(void)
 		SYSCTL_DESCR("Auto-unload delay"),
 		sysctl_module_autotime, 0, &module_autotime, 0,
 		CTL_CREATE, CTL_EOL);
+	sysctl_createv(&module_sysctllog, 0, &node, NULL,
+		CTLFLAG_PERMANENT | CTLFLAG_READWRITE,
+		CTLTYPE_INT, "noautoload",
+		SYSCTL_DESCR("List of module patterns not to be autoloaded"),
+		sysctl_module_noautoload, 0, NULL, 0,
+		CTL_CREATE, CTL_EOL);
 }
 
 /*
@@ -678,6 +754,9 @@ module_autoload(const char *filename, modclass_t modclass)
 {
 	int error;
 
+	if (!module_allow_autoload(filename))
+		return EACCES;
+
 	kernconfig_lock();
 
 	/* Nothing if the user has disabled it. */
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 6667fcf5ee7b..8fe88f33805d 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tty.c,v 1.285 2020/01/07 08:52:47 skrll Exp $	*/
+/*	$NetBSD: tty.c,v 1.286 2020/01/21 15:25:38 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.285 2020/01/07 08:52:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.286 2020/01/21 15:25:38 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -2582,7 +2582,7 @@ ttygetinfo(struct tty *tp, int fromsig, char *buf, size_t bufsz)
 				}
 				msg = "found only zombie processes\n";
 			}
-			if (fromsig &&
+			if (pick && fromsig &&
 			    (SIGACTION_PS(pick->p_sigacts, SIGINFO).sa_flags &
 			    SA_NOKERNINFO)) {
 				mutex_exit(pick->p_lock);