Module Name: src
Committed By: maxv
Date: Thu Jan 18 13:31:21 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_module.c
src/sys/kern: sys_module.c
Log Message:
Don't return the address of the kernel modules if the user is not
privileged. Discussed on tech-kern@.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/netbsd32/netbsd32_module.c
cvs rdiff -u -r1.22 -r1.23 src/sys/kern/sys_module.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_module.c
diff -u src/sys/compat/netbsd32/netbsd32_module.c:1.5 src/sys/compat/netbsd32/netbsd32_module.c:1.6
--- src/sys/compat/netbsd32/netbsd32_module.c:1.5 Thu Jun 1 02:45:08 2017
+++ src/sys/compat/netbsd32/netbsd32_module.c Thu Jan 18 13:31:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_module.c,v 1.5 2017/06/01 02:45:08 chs Exp $ */
+/* $NetBSD: netbsd32_module.c,v 1.6 2018/01/18 13:31:21 maxv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.5 2017/06/01 02:45:08 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6 2018/01/18 13:31:21 maxv Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -52,6 +52,12 @@ modctl32_handle_stat(struct netbsd32_iov
size_t size;
size_t mslen;
int error;
+ bool stataddr;
+
+ /* If not privileged, don't expose kernel addresses. */
+ error = kauth_authorize_system(kauth_cred_get(), KAUTH_SYSTEM_MODULE,
+ 0, (void *)(uintptr_t)MODCTL_STAT, NULL, NULL);
+ stataddr = (error == 0);
kernconfig_lock();
mslen = (module_count+module_builtinlist+1) * sizeof(modstat_t);
@@ -64,7 +70,7 @@ modctl32_handle_stat(struct netbsd32_iov
strlcpy(ms->ms_required, mi->mi_required,
sizeof(ms->ms_required));
}
- if (mod->mod_kobj != NULL) {
+ if (mod->mod_kobj != NULL && stataddr) {
kobj_stat(mod->mod_kobj, &addr, &size);
ms->ms_addr = addr;
ms->ms_size = size;
@@ -82,7 +88,7 @@ modctl32_handle_stat(struct netbsd32_iov
strlcpy(ms->ms_required, mi->mi_required,
sizeof(ms->ms_required));
}
- if (mod->mod_kobj != NULL) {
+ if (mod->mod_kobj != NULL && stataddr) {
kobj_stat(mod->mod_kobj, &addr, &size);
ms->ms_addr = addr;
ms->ms_size = size;
Index: src/sys/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.22 src/sys/kern/sys_module.c:1.23
--- src/sys/kern/sys_module.c:1.22 Thu Jun 1 02:45:13 2017
+++ src/sys/kern/sys_module.c Thu Jan 18 13:31:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_module.c,v 1.22 2017/06/01 02:45:13 chs Exp $ */
+/* $NetBSD: sys_module.c,v 1.23 2018/01/18 13:31:20 maxv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.22 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23 2018/01/18 13:31:20 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -120,6 +120,12 @@ handle_modctl_stat(struct iovec *iov, vo
size_t size;
size_t mslen;
int error;
+ bool stataddr;
+
+ /* If not privileged, don't expose kernel addresses. */
+ error = kauth_authorize_system(kauth_cred_get(), KAUTH_SYSTEM_MODULE,
+ 0, (void *)(uintptr_t)MODCTL_STAT, NULL, NULL);
+ stataddr = (error == 0);
kernconfig_lock();
mslen = (module_count+module_builtinlist+1) * sizeof(modstat_t);
@@ -132,7 +138,7 @@ handle_modctl_stat(struct iovec *iov, vo
strlcpy(ms->ms_required, mi->mi_required,
sizeof(ms->ms_required));
}
- if (mod->mod_kobj != NULL) {
+ if (mod->mod_kobj != NULL && stataddr) {
kobj_stat(mod->mod_kobj, &addr, &size);
ms->ms_addr = addr;
ms->ms_size = size;
@@ -150,7 +156,7 @@ handle_modctl_stat(struct iovec *iov, vo
strlcpy(ms->ms_required, mi->mi_required,
sizeof(ms->ms_required));
}
- if (mod->mod_kobj != NULL) {
+ if (mod->mod_kobj != NULL && stataddr) {
kobj_stat(mod->mod_kobj, &addr, &size);
ms->ms_addr = addr;
ms->ms_size = size;
