summaryrefslogtreecommitdiff
path: root/sys/secmodel
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2020-02-21 00:26:21 +0000
committerjoerg <joerg@NetBSD.org>2020-02-21 00:26:21 +0000
commit7cd8f2ab9939a75ffdef271a8e1d0702825fbc52 (patch)
tree9a9ea6c0298e9455874ae0b9e30b1251036ed418 /sys/secmodel
parentd9d5f576e1104f6636e2c3cab1efb025a8e95452 (diff)
Explicitly cast pointers to uintptr_t before casting to enums. They are
not necessarily the same size. Don't cast pointers to bool, check for NULL instead.
Diffstat (limited to 'sys/secmodel')
-rw-r--r--sys/secmodel/extensions/secmodel_extensions.c10
-rw-r--r--sys/secmodel/keylock/secmodel_keylock.c12
-rw-r--r--sys/secmodel/securelevel/secmodel_securelevel.c12
-rw-r--r--sys/secmodel/suser/secmodel_suser.c12
4 files changed, 23 insertions, 23 deletions
diff --git a/sys/secmodel/extensions/secmodel_extensions.c b/sys/secmodel/extensions/secmodel_extensions.c
index fda985d4164..4206ef6b9e8 100644
--- a/sys/secmodel/extensions/secmodel_extensions.c
+++ b/sys/secmodel/extensions/secmodel_extensions.c
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_extensions.c,v 1.10 2018/09/04 14:31:19 maxv Exp $ */
+/* $NetBSD: secmodel_extensions.c,v 1.11 2020/02/21 00:26:23 joerg Exp $ */
/*-
* Copyright (c) 2011 Elad Efrat <elad@NetBSD.org>
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_extensions.c,v 1.10 2018/09/04 14:31:19 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_extensions.c,v 1.11 2020/02/21 00:26:23 joerg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -346,7 +346,7 @@ secmodel_extensions_system_cb(kauth_cred_t cred, kauth_action_t action,
enum kauth_system_req req;
int error;
- req = (enum kauth_system_req)arg0;
+ req = (enum kauth_system_req)(uintptr_t)arg0;
result = KAUTH_RESULT_DEFER;
switch (action) {
@@ -420,7 +420,7 @@ secmodel_extensions_process_cb(kauth_cred_t cred, kauth_action_t action,
enum kauth_process_req req;
result = KAUTH_RESULT_DEFER;
- req = (enum kauth_process_req)arg1;
+ req = (enum kauth_process_req)(uintptr_t)arg1;
switch (action) {
case KAUTH_PROCESS_CANSEE:
@@ -481,7 +481,7 @@ secmodel_extensions_network_cb(kauth_cred_t cred, kauth_action_t action,
enum kauth_network_req req;
result = KAUTH_RESULT_DEFER;
- req = (enum kauth_network_req)arg0;
+ req = (enum kauth_network_req)(uintptr_t)arg0;
if (action != KAUTH_NETWORK_SOCKET ||
req != KAUTH_REQ_NETWORK_SOCKET_CANSEE)
diff --git a/sys/secmodel/keylock/secmodel_keylock.c b/sys/secmodel/keylock/secmodel_keylock.c
index 01e67f21f71..b34b3898a83 100644
--- a/sys/secmodel/keylock/secmodel_keylock.c
+++ b/sys/secmodel/keylock/secmodel_keylock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_keylock.c,v 1.9 2018/07/15 05:16:45 maxv Exp $ */
+/* $NetBSD: secmodel_keylock.c,v 1.10 2020/02/21 00:26:23 joerg Exp $ */
/*-
* Copyright (c) 2009 Marc Balmer <marc@msys.ch>
* Copyright (c) 2006 Elad Efrat <elad@NetBSD.org>
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_keylock.c,v 1.9 2018/07/15 05:16:45 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_keylock.c,v 1.10 2020/02/21 00:26:23 joerg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -168,7 +168,7 @@ secmodel_keylock_system_cb(kauth_cred_t cred,
return KAUTH_RESULT_DENY;
result = KAUTH_RESULT_DEFER;
- req = (enum kauth_system_req)arg0;
+ req = (enum kauth_system_req)(uintptr_t)arg0;
switch (action) {
case KAUTH_SYSTEM_CHSYSFLAGS:
@@ -282,7 +282,7 @@ secmodel_keylock_process_cb(kauth_cred_t cred,
case KAUTH_PROCESS_PROCFS: {
enum kauth_process_req req;
- req = (enum kauth_process_req)arg2;
+ req = (enum kauth_process_req)(uintptr_t)arg2;
switch (req) {
case KAUTH_REQ_PROCESS_PROCFS_READ:
break;
@@ -336,7 +336,7 @@ secmodel_keylock_network_cb(kauth_cred_t cred,
return KAUTH_RESULT_DENY;
result = KAUTH_RESULT_DEFER;
- req = (enum kauth_network_req)arg0;
+ req = (enum kauth_network_req)(uintptr_t)arg0;
switch (action) {
case KAUTH_NETWORK_FIREWALL:
@@ -426,7 +426,7 @@ secmodel_keylock_device_cb(kauth_cred_t cred,
struct vnode *vp;
enum kauth_device_req req;
- req = (enum kauth_device_req)arg0;
+ req = (enum kauth_device_req)(uintptr_t)arg0;
vp = arg1;
KASSERT(vp != NULL);
diff --git a/sys/secmodel/securelevel/secmodel_securelevel.c b/sys/secmodel/securelevel/secmodel_securelevel.c
index 9b91bfc4864..9ae4d664df7 100644
--- a/sys/secmodel/securelevel/secmodel_securelevel.c
+++ b/sys/secmodel/securelevel/secmodel_securelevel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_securelevel.c,v 1.32 2018/07/15 05:16:45 maxv Exp $ */
+/* $NetBSD: secmodel_securelevel.c,v 1.33 2020/02/21 00:26:23 joerg Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <elad@NetBSD.org>
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.32 2018/07/15 05:16:45 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.33 2020/02/21 00:26:23 joerg Exp $");
#ifdef _KERNEL_OPT
#include "opt_insecure.h"
@@ -260,7 +260,7 @@ secmodel_securelevel_system_cb(kauth_cred_t cred, kauth_action_t action,
enum kauth_system_req req;
result = KAUTH_RESULT_DEFER;
- req = (enum kauth_system_req)arg0;
+ req = (enum kauth_system_req)(uintptr_t)arg0;
switch (action) {
case KAUTH_SYSTEM_CHSYSFLAGS:
@@ -376,7 +376,7 @@ secmodel_securelevel_process_cb(kauth_cred_t cred, kauth_action_t action,
case KAUTH_PROCESS_PROCFS: {
enum kauth_process_req req;
- req = (enum kauth_process_req)arg2;
+ req = (enum kauth_process_req)(uintptr_t)arg2;
switch (req) {
case KAUTH_REQ_PROCESS_PROCFS_READ:
break;
@@ -428,7 +428,7 @@ secmodel_securelevel_network_cb(kauth_cred_t cred, kauth_action_t action,
enum kauth_network_req req;
result = KAUTH_RESULT_DEFER;
- req = (enum kauth_network_req)arg0;
+ req = (enum kauth_network_req)(uintptr_t)arg0;
switch (action) {
case KAUTH_NETWORK_FIREWALL:
@@ -520,7 +520,7 @@ secmodel_securelevel_device_cb(kauth_cred_t cred, kauth_action_t action,
struct vnode *vp;
enum kauth_device_req req;
- req = (enum kauth_device_req)arg0;
+ req = (enum kauth_device_req)(uintptr_t)arg0;
vp = arg1;
KASSERT(vp != NULL);
diff --git a/sys/secmodel/suser/secmodel_suser.c b/sys/secmodel/suser/secmodel_suser.c
index 609813de742..46131689be7 100644
--- a/sys/secmodel/suser/secmodel_suser.c
+++ b/sys/secmodel/suser/secmodel_suser.c
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_suser.c,v 1.50 2019/04/10 18:49:04 maxv Exp $ */
+/* $NetBSD: secmodel_suser.c,v 1.51 2020/02/21 00:26:23 joerg Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <elad@NetBSD.org>
* All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.50 2019/04/10 18:49:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.51 2020/02/21 00:26:23 joerg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -236,7 +236,7 @@ secmodel_suser_system_cb(kauth_cred_t cred, kauth_action_t action,
isroot = suser_isroot(cred);
result = KAUTH_RESULT_DEFER;
- req = (enum kauth_system_req)arg0;
+ req = (enum kauth_system_req)(uintptr_t)arg0;
switch (action) {
case KAUTH_SYSTEM_CPU:
@@ -530,7 +530,7 @@ secmodel_suser_process_cb(kauth_cred_t cred, kauth_action_t action,
case KAUTH_PROCESS_RLIMIT: {
enum kauth_process_req req;
- req = (enum kauth_process_req)(unsigned long)arg1;
+ req = (enum kauth_process_req)(uintptr_t)arg1;
switch (req) {
case KAUTH_REQ_PROCESS_RLIMIT_SET:
@@ -572,7 +572,7 @@ secmodel_suser_network_cb(kauth_cred_t cred, kauth_action_t action,
isroot = suser_isroot(cred);
result = KAUTH_RESULT_DEFER;
- req = (enum kauth_network_req)arg0;
+ req = (enum kauth_network_req)(uintptr_t)arg0;
switch (action) {
case KAUTH_NETWORK_ALTQ:
@@ -902,7 +902,7 @@ secmodel_suser_device_cb(kauth_cred_t cred, kauth_action_t action,
case KAUTH_DEVICE_BLUETOOTH_BTUART: {
enum kauth_device_req req;
- req = (enum kauth_device_req)arg0;
+ req = (enum kauth_device_req)(uintptr_t)arg0;
switch (req) {
case KAUTH_REQ_DEVICE_BLUETOOTH_BCSP_ADD:
case KAUTH_REQ_DEVICE_BLUETOOTH_BTUART_ADD: