Module Name: src Committed By: joerg Date: Fri Feb 21 00:26:23 UTC 2020
Modified Files: src/external/bsd/libevent/dist/test: regress_http.c regress_ssl.c src/external/bsd/wpa/dist/src/radius: radius_client.c src/external/cddl/osnet/dist/tools/ctf/cvt: iidesc.c src/sys/arch/x86/x86: spectre.c tsc.c src/sys/dev: clockctl.c src/sys/dev/nvmm/x86: nvmm_x86_svm.c nvmm_x86_vmx.c src/sys/dist/pf/net: pf_ioctl.c src/sys/external/bsd/ipf/netinet: ip_fil_netbsd.c src/sys/kern: kern_ktrace.c kern_proc.c kern_resource.c kern_veriexec.c sys_pset.c sysv_ipc.c uipc_socket.c vfs_init.c src/sys/net: if.c src/sys/netsmb: smb_conn.c src/sys/secmodel/extensions: secmodel_extensions.c src/sys/secmodel/keylock: secmodel_keylock.c src/sys/secmodel/securelevel: secmodel_securelevel.c src/sys/secmodel/suser: secmodel_suser.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/dist/test/regress_http.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libevent/dist/test/regress_ssl.c cvs rdiff -u -r1.1.1.7 -r1.2 \ src/external/bsd/wpa/dist/src/radius/radius_client.c cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/x86/x86/spectre.c cvs rdiff -u -r1.37 -r1.38 src/sys/arch/x86/x86/tsc.c cvs rdiff -u -r1.37 -r1.38 src/sys/dev/clockctl.c cvs rdiff -u -r1.55 -r1.56 src/sys/dev/nvmm/x86/nvmm_x86_svm.c cvs rdiff -u -r1.48 -r1.49 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c cvs rdiff -u -r1.56 -r1.57 src/sys/dist/pf/net/pf_ioctl.c cvs rdiff -u -r1.33 -r1.34 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c cvs rdiff -u -r1.174 -r1.175 src/sys/kern/kern_ktrace.c cvs rdiff -u -r1.240 -r1.241 src/sys/kern/kern_proc.c cvs rdiff -u -r1.185 -r1.186 src/sys/kern/kern_resource.c cvs rdiff -u -r1.22 -r1.23 src/sys/kern/kern_veriexec.c \ src/sys/kern/sys_pset.c cvs rdiff -u -r1.40 -r1.41 src/sys/kern/sysv_ipc.c cvs rdiff -u -r1.286 -r1.287 src/sys/kern/uipc_socket.c cvs rdiff -u -r1.49 -r1.50 src/sys/kern/vfs_init.c cvs rdiff -u -r1.472 -r1.473 src/sys/net/if.c cvs rdiff -u -r1.30 -r1.31 src/sys/netsmb/smb_conn.c cvs rdiff -u -r1.10 -r1.11 src/sys/secmodel/extensions/secmodel_extensions.c cvs rdiff -u -r1.9 -r1.10 src/sys/secmodel/keylock/secmodel_keylock.c cvs rdiff -u -r1.32 -r1.33 \ src/sys/secmodel/securelevel/secmodel_securelevel.c cvs rdiff -u -r1.50 -r1.51 src/sys/secmodel/suser/secmodel_suser.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/libevent/dist/test/regress_http.c diff -u src/external/bsd/libevent/dist/test/regress_http.c:1.5 src/external/bsd/libevent/dist/test/regress_http.c:1.6 --- src/external/bsd/libevent/dist/test/regress_http.c:1.5 Tue Jan 31 23:17:40 2017 +++ src/external/bsd/libevent/dist/test/regress_http.c Fri Feb 21 00:26:21 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: regress_http.c,v 1.5 2017/01/31 23:17:40 christos Exp $ */ +/* $NetBSD: regress_http.c,v 1.6 2020/02/21 00:26:21 joerg Exp $ */ /* * Copyright (c) 2003-2007 Niels Provos <pro...@citi.umich.edu> * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson @@ -35,7 +35,7 @@ #include "event2/event-config.h" #include <sys/cdefs.h> -__RCSID("$NetBSD: regress_http.c,v 1.5 2017/01/31 23:17:40 christos Exp $"); +__RCSID("$NetBSD: regress_http.c,v 1.6 2020/02/21 00:26:21 joerg Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -1426,7 +1426,7 @@ http_cancel_test(void *arg) struct event_base *base_to_fill = data->base; enum http_cancel_test_type type = - (enum http_cancel_test_type)data->setup_data; + (enum http_cancel_test_type)(uintptr_t)data->setup_data; struct evhttp *http = http_setup(&port, data->base, 0); if (type & BY_HOST) { Index: src/external/bsd/libevent/dist/test/regress_ssl.c diff -u src/external/bsd/libevent/dist/test/regress_ssl.c:1.3 src/external/bsd/libevent/dist/test/regress_ssl.c:1.4 --- src/external/bsd/libevent/dist/test/regress_ssl.c:1.3 Tue Jan 31 23:17:40 2017 +++ src/external/bsd/libevent/dist/test/regress_ssl.c Fri Feb 21 00:26:21 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: regress_ssl.c,v 1.3 2017/01/31 23:17:40 christos Exp $ */ +/* $NetBSD: regress_ssl.c,v 1.4 2020/02/21 00:26:21 joerg Exp $ */ /* * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson * @@ -265,7 +265,7 @@ respond_to_number(struct bufferevent *be int n; enum regress_openssl_type type; - type = (enum regress_openssl_type)ctx; + type = (enum regress_openssl_type)(uintptr_t)ctx; line = evbuffer_readln(b, NULL, EVBUFFER_EOL_LF); if (! line) @@ -306,7 +306,7 @@ static void eventcb(struct bufferevent *bev, short what, void *ctx) { enum regress_openssl_type type; - type = (enum regress_openssl_type)ctx; + type = (enum regress_openssl_type)(uintptr_t)ctx; TT_BLATHER(("Got event %d", (int)what)); if (what & BEV_EVENT_CONNECTED) { @@ -407,7 +407,7 @@ regress_bufferevent_openssl(void *arg) evutil_socket_t *fd_pair = NULL; enum regress_openssl_type type; - type = (enum regress_openssl_type)data->setup_data; + type = (enum regress_openssl_type)(uintptr_t)data->setup_data; tt_assert(cert); tt_assert(key); @@ -526,7 +526,7 @@ acceptcb(struct evconnlistener *listener enum regress_openssl_type type; SSL *ssl = SSL_new(get_ssl_ctx()); - type = (enum regress_openssl_type)data->setup_data; + type = (enum regress_openssl_type)(uintptr_t)data->setup_data; SSL_use_certificate(ssl, ssl_getcert()); SSL_use_PrivateKey(ssl, ssl_getkey()); @@ -678,7 +678,7 @@ regress_bufferevent_openssl_connect(void struct rwcount rw = { -1, 0, 0 }; enum regress_openssl_type type; - type = (enum regress_openssl_type)data->setup_data; + type = (enum regress_openssl_type)(uintptr_t)data->setup_data; init_ssl(); Index: src/external/bsd/wpa/dist/src/radius/radius_client.c diff -u src/external/bsd/wpa/dist/src/radius/radius_client.c:1.1.1.7 src/external/bsd/wpa/dist/src/radius/radius_client.c:1.2 --- src/external/bsd/wpa/dist/src/radius/radius_client.c:1.1.1.7 Fri Jan 4 19:29:17 2019 +++ src/external/bsd/wpa/dist/src/radius/radius_client.c Fri Feb 21 00:26:22 2020 @@ -791,7 +791,7 @@ static void radius_client_receive(int so { struct radius_client_data *radius = eloop_ctx; struct hostapd_radius_servers *conf = radius->conf; - RadiusType msg_type = (RadiusType) sock_ctx; + RadiusType msg_type = (RadiusType)(uintptr_t) sock_ctx; int len, roundtrip; unsigned char buf[3000]; struct radius_msg *msg; Index: src/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c:1.3 src/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c:1.4 --- src/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c:1.3 Wed Feb 24 21:53:26 2010 +++ src/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c Fri Feb 21 00:26:22 2020 @@ -183,7 +183,7 @@ int iidesc_count_type(void *data, void *private) { iidesc_t *ii = data; - iitype_t match = (iitype_t)private; + iitype_t match = (iitype_t)(uintptr_t)private; return (ii->ii_type == match); } Index: src/sys/arch/x86/x86/spectre.c diff -u src/sys/arch/x86/x86/spectre.c:1.33 src/sys/arch/x86/x86/spectre.c:1.34 --- src/sys/arch/x86/x86/spectre.c:1.33 Fri Jan 31 08:55:38 2020 +++ src/sys/arch/x86/x86/spectre.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: spectre.c,v 1.33 2020/01/31 08:55:38 maxv Exp $ */ +/* $NetBSD: spectre.c,v 1.34 2020/02/21 00:26:22 joerg Exp $ */ /* * Copyright (c) 2018-2019 NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.33 2020/01/31 08:55:38 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.34 2020/02/21 00:26:22 joerg Exp $"); #include "opt_spectre.h" @@ -277,7 +277,7 @@ static void mitigation_v2_change_cpu(void *arg1, void *arg2) { struct cpu_info *ci = curcpu(); - bool enabled = (bool)arg1; + bool enabled = arg1 != NULL; u_long psl = 0; /* Rendez-vous 1 (IBRS only). */ @@ -488,7 +488,7 @@ mitigation_v4_apply_cpu(bool enabled) static void mitigation_v4_change_cpu(void *arg1, void *arg2) { - bool enabled = (bool)arg1; + bool enabled = arg1 != NULL; mitigation_v4_apply_cpu(enabled); } @@ -635,7 +635,7 @@ static void mitigation_mds_change_cpu(void *arg1, void *arg2) { struct cpu_info *ci = curcpu(); - bool enabled = (bool)arg1; + bool enabled = arg1 != NULL; u_long psl = 0; /* Rendez-vous 1. */ @@ -812,7 +812,7 @@ static void mitigation_taa_change_cpu(void *arg1, void *arg2) { struct cpu_info *ci = curcpu(); - bool enabled = (bool)arg1; + bool enabled = arg1 != NULL; mitigation_taa_apply_cpu(ci, enabled); } Index: src/sys/arch/x86/x86/tsc.c diff -u src/sys/arch/x86/x86/tsc.c:1.37 src/sys/arch/x86/x86/tsc.c:1.38 --- src/sys/arch/x86/x86/tsc.c:1.37 Mon Oct 2 19:23:16 2017 +++ src/sys/arch/x86/x86/tsc.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: tsc.c,v 1.37 2017/10/02 19:23:16 maxv Exp $ */ +/* $NetBSD: tsc.c,v 1.38 2020/02/21 00:26:22 joerg Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.37 2017/10/02 19:23:16 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.38 2020/02/21 00:26:22 joerg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -271,7 +271,7 @@ tsc_sync_ap(struct cpu_info *ci) static void tsc_apply_cpu(void *arg1, void *arg2) { - bool enable = (bool)arg1; + bool enable = arg1 != NULL; if (enable) { lcr4(rcr4() & ~CR4_TSD); } else { Index: src/sys/dev/clockctl.c diff -u src/sys/dev/clockctl.c:1.37 src/sys/dev/clockctl.c:1.38 --- src/sys/dev/clockctl.c:1.37 Fri Mar 1 11:06:56 2019 +++ src/sys/dev/clockctl.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: clockctl.c,v 1.37 2019/03/01 11:06:56 pgoyette Exp $ */ +/* $NetBSD: clockctl.c,v 1.38 2020/02/21 00:26:22 joerg Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.37 2019/03/01 11:06:56 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.38 2020/02/21 00:26:22 joerg Exp $"); #ifdef _KERNEL_OPT #include "opt_ntp.h" @@ -90,13 +90,13 @@ clockctl_listener_cb(kauth_cred_t cred, bool device_context; result = KAUTH_RESULT_DEFER; - req = (enum kauth_system_req)arg0; + req = (enum kauth_system_req)(uintptr_t)arg0; if ((action != KAUTH_SYSTEM_TIME) || (req != KAUTH_REQ_SYSTEM_TIME_SYSTEM)) return result; - device_context = (bool)arg3; + device_context = arg3 != NULL; /* Device is controlled by permissions, so allow. */ if (device_context) Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.55 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.56 --- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.55 Tue Dec 10 18:06:50 2019 +++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: nvmm_x86_svm.c,v 1.55 2019/12/10 18:06:50 ad Exp $ */ +/* $NetBSD: nvmm_x86_svm.c,v 1.56 2020/02/21 00:26:22 joerg Exp $ */ /* * Copyright (c) 2018-2019 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.55 2019/12/10 18:06:50 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.56 2020/02/21 00:26:22 joerg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2314,7 +2314,7 @@ svm_init_asid(uint32_t maxasid) static void svm_change_cpu(void *arg1, void *arg2) { - bool enable = (bool)arg1; + bool enable = arg1 != NULL; uint64_t msr; msr = rdmsr(MSR_VMCR); Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.48 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.49 --- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.48 Thu Jan 9 16:27:57 2020 +++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: nvmm_x86_vmx.c,v 1.48 2020/01/09 16:27:57 maxv Exp $ */ +/* $NetBSD: nvmm_x86_vmx.c,v 1.49 2020/02/21 00:26:22 joerg Exp $ */ /* * Copyright (c) 2018-2019 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.48 2020/01/09 16:27:57 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.49 2020/02/21 00:26:22 joerg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -3115,7 +3115,7 @@ static void vmx_change_cpu(void *arg1, void *arg2) { struct cpu_info *ci = curcpu(); - bool enable = (bool)arg1; + bool enable = arg1 != NULL; uint64_t cr4; if (!enable) { Index: src/sys/dist/pf/net/pf_ioctl.c diff -u src/sys/dist/pf/net/pf_ioctl.c:1.56 src/sys/dist/pf/net/pf_ioctl.c:1.57 --- src/sys/dist/pf/net/pf_ioctl.c:1.56 Fri Aug 10 07:16:13 2018 +++ src/sys/dist/pf/net/pf_ioctl.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pf_ioctl.c,v 1.56 2018/08/10 07:16:13 maxv Exp $ */ +/* $NetBSD: pf_ioctl.c,v 1.57 2020/02/21 00:26:22 joerg Exp $ */ /* $OpenBSD: pf_ioctl.c,v 1.182 2007/06/24 11:17:13 mcbride Exp $ */ /* @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.56 2018/08/10 07:16:13 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.57 2020/02/21 00:26:22 joerg Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -213,7 +213,7 @@ pf_listener_cb(kauth_cred_t cred, kauth_ 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_FIREWALL) return result; Index: src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c diff -u src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.33 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.34 --- src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.33 Mon Sep 30 16:59:09 2019 +++ src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil_netbsd.c,v 1.33 2019/09/30 16:59:09 bouyer Exp $ */ +/* $NetBSD: ip_fil_netbsd.c,v 1.34 2020/02/21 00:26:22 joerg Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -8,7 +8,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.33 2019/09/30 16:59:09 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.34 2020/02/21 00:26:22 joerg Exp $"); #else static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 1.1.1.2 2012/07/22 13:45:17 darrenr Exp"; @@ -329,7 +329,7 @@ ipf_listener_cb(kauth_cred_t cred, kauth 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_FIREWALL) return result; Index: src/sys/kern/kern_ktrace.c diff -u src/sys/kern/kern_ktrace.c:1.174 src/sys/kern/kern_ktrace.c:1.175 --- src/sys/kern/kern_ktrace.c:1.174 Wed Feb 5 09:59:50 2020 +++ src/sys/kern/kern_ktrace.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_ktrace.c,v 1.174 2020/02/05 09:59:50 msaitoh Exp $ */ +/* $NetBSD: kern_ktrace.c,v 1.175 2020/02/21 00:26:22 joerg Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.174 2020/02/05 09:59:50 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.175 2020/02/21 00:26:22 joerg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -225,7 +225,7 @@ ktrace_listener_cb(kauth_cred_t cred, ka if (action != KAUTH_PROCESS_KTRACE) return result; - req = (enum kauth_process_req)(unsigned long)arg1; + req = (enum kauth_process_req)(uintptr_t)arg1; /* Privileged; secmodel should handle these. */ if (req == KAUTH_REQ_PROCESS_KTRACE_PERSISTENT) Index: src/sys/kern/kern_proc.c diff -u src/sys/kern/kern_proc.c:1.240 src/sys/kern/kern_proc.c:1.241 --- src/sys/kern/kern_proc.c:1.240 Wed Jan 29 15:47:52 2020 +++ src/sys/kern/kern_proc.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_proc.c,v 1.240 2020/01/29 15:47:52 ad Exp $ */ +/* $NetBSD: kern_proc.c,v 1.241 2020/02/21 00:26:22 joerg Exp $ */ /*- * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.240 2020/01/29 15:47:52 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.241 2020/02/21 00:26:22 joerg Exp $"); #ifdef _KERNEL_OPT #include "opt_kstack.h" @@ -262,7 +262,7 @@ proc_listener_cb(kauth_cred_t cred, kaut case KAUTH_PROCESS_CANSEE: { enum kauth_process_req req; - req = (enum kauth_process_req)arg1; + req = (enum kauth_process_req)(uintptr_t)arg1; switch (req) { case KAUTH_REQ_PROCESS_CANSEE_ARGS: Index: src/sys/kern/kern_resource.c diff -u src/sys/kern/kern_resource.c:1.185 src/sys/kern/kern_resource.c:1.186 --- src/sys/kern/kern_resource.c:1.185 Sat Feb 15 18:12:15 2020 +++ src/sys/kern/kern_resource.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_resource.c,v 1.185 2020/02/15 18:12:15 ad Exp $ */ +/* $NetBSD: kern_resource.c,v 1.186 2020/02/21 00:26:22 joerg Exp $ */ /*- * Copyright (c) 1982, 1986, 1991, 1993 @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_resource.c,v 1.185 2020/02/15 18:12:15 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_resource.c,v 1.186 2020/02/21 00:26:22 joerg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -99,7 +99,7 @@ resource_listener_cb(kauth_cred_t cred, 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_GET: Index: src/sys/kern/kern_veriexec.c diff -u src/sys/kern/kern_veriexec.c:1.22 src/sys/kern/kern_veriexec.c:1.23 --- src/sys/kern/kern_veriexec.c:1.22 Wed Oct 16 18:29:49 2019 +++ src/sys/kern/kern_veriexec.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_veriexec.c,v 1.22 2019/10/16 18:29:49 christos Exp $ */ +/* $NetBSD: kern_veriexec.c,v 1.23 2020/02/21 00:26:22 joerg Exp $ */ /*- * Copyright (c) 2005, 2006 Elad Efrat <e...@netbsd.org> @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.22 2019/10/16 18:29:49 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.23 2020/02/21 00:26:22 joerg Exp $"); #include "opt_veriexec.h" @@ -307,7 +307,7 @@ veriexec_listener_cb(kauth_cred_t cred, return KAUTH_RESULT_DEFER; result = KAUTH_RESULT_DEFER; - req = (enum kauth_system_req)arg0; + req = (enum kauth_system_req)(uintptr_t)arg0; if (req == KAUTH_REQ_SYSTEM_VERIEXEC_MODIFY && veriexec_strict > VERIEXEC_LEARNING) { @@ -921,7 +921,7 @@ veriexec_raw_cb(kauth_cred_t cred, kauth struct veriexec_table_entry *vte; result = KAUTH_RESULT_DENY; - req = (enum kauth_device_req)arg0; + req = (enum kauth_device_req)(uintptr_t)arg0; switch (action) { case KAUTH_DEVICE_RAWIO_SPEC: { Index: src/sys/kern/sys_pset.c diff -u src/sys/kern/sys_pset.c:1.22 src/sys/kern/sys_pset.c:1.23 --- src/sys/kern/sys_pset.c:1.22 Thu Nov 21 17:54:04 2019 +++ src/sys/kern/sys_pset.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_pset.c,v 1.22 2019/11/21 17:54:04 ad Exp $ */ +/* $NetBSD: sys_pset.c,v 1.23 2020/02/21 00:26:22 joerg Exp $ */ /* * Copyright (c) 2008, Mindaugas Rasiukevicius <rmind at NetBSD org> @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sys_pset.c,v 1.22 2019/11/21 17:54:04 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_pset.c,v 1.23 2020/02/21 00:26:22 joerg Exp $"); #include <sys/param.h> @@ -72,8 +72,8 @@ psets_listener_cb(kauth_cred_t cred, kau int result; result = KAUTH_RESULT_DEFER; - req = (enum kauth_system_req)arg0; - id = (psetid_t)(unsigned long)arg1; + req = (enum kauth_system_req)(uintptr_t)arg0; + id = (psetid_t)(uintptr_t)arg1; if (action != KAUTH_SYSTEM_PSET) return result; Index: src/sys/kern/sysv_ipc.c diff -u src/sys/kern/sysv_ipc.c:1.40 src/sys/kern/sysv_ipc.c:1.41 --- src/sys/kern/sysv_ipc.c:1.40 Wed Aug 7 00:38:02 2019 +++ src/sys/kern/sysv_ipc.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: sysv_ipc.c,v 1.40 2019/08/07 00:38:02 pgoyette Exp $ */ +/* $NetBSD: sysv_ipc.c,v 1.41 2020/02/21 00:26:22 joerg Exp $ */ /*- * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sysv_ipc.c,v 1.40 2019/08/07 00:38:02 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sysv_ipc.c,v 1.41 2020/02/21 00:26:22 joerg Exp $"); #ifdef _KERNEL_OPT #include "opt_sysv.h" @@ -263,7 +263,7 @@ sysvipc_listener_cb(kauth_cred_t cred, k int mode; enum kauth_system_req req; - req = (enum kauth_system_req)arg0; + req = (enum kauth_system_req)(uintptr_t)arg0; if (!(action == KAUTH_SYSTEM_SYSVIPC && req == KAUTH_REQ_SYSTEM_SYSVIPC_BYPASS)) Index: src/sys/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.286 src/sys/kern/uipc_socket.c:1.287 --- src/sys/kern/uipc_socket.c:1.286 Tue Feb 18 00:40:50 2020 +++ src/sys/kern/uipc_socket.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.286 2020/02/18 00:40:50 christos Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.287 2020/02/21 00:26:22 joerg Exp $ */ /* * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.286 2020/02/18 00:40:50 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.287 2020/02/21 00:26:22 joerg Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -386,7 +386,7 @@ socket_listener_cb(kauth_cred_t cred, ka 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) && (action != KAUTH_NETWORK_BIND)) Index: src/sys/kern/vfs_init.c diff -u src/sys/kern/vfs_init.c:1.49 src/sys/kern/vfs_init.c:1.50 --- src/sys/kern/vfs_init.c:1.49 Thu Mar 28 18:12:24 2019 +++ src/sys/kern/vfs_init.c Fri Feb 21 00:26:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_init.c,v 1.49 2019/03/28 18:12:24 maxv Exp $ */ +/* $NetBSD: vfs_init.c,v 1.50 2020/02/21 00:26:22 joerg Exp $ */ /*- * Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vfs_init.c,v 1.49 2019/03/28 18:12:24 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_init.c,v 1.50 2020/02/21 00:26:22 joerg Exp $"); #include <sys/param.h> #include <sys/mount.h> @@ -368,7 +368,7 @@ mount_listener_cb(kauth_cred_t cred, kau enum kauth_system_req req; result = KAUTH_RESULT_DEFER; - req = (enum kauth_system_req)arg0; + req = (enum kauth_system_req)(uintptr_t)(uintptr_t)arg0; if (action != KAUTH_SYSTEM_MOUNT) return result; Index: src/sys/net/if.c diff -u src/sys/net/if.c:1.472 src/sys/net/if.c:1.473 --- src/sys/net/if.c:1.472 Fri Feb 7 01:14:55 2020 +++ src/sys/net/if.c Fri Feb 21 00:26:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if.c,v 1.472 2020/02/07 01:14:55 thorpej Exp $ */ +/* $NetBSD: if.c,v 1.473 2020/02/21 00:26:23 joerg Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.472 2020/02/07 01:14:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.473 2020/02/21 00:26:23 joerg Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -259,7 +259,7 @@ if_listener_cb(kauth_cred_t cred, kauth_ enum kauth_network_req req; result = KAUTH_RESULT_DEFER; - req = (enum kauth_network_req)arg1; + req = (enum kauth_network_req)(uintptr_t)arg1; if (action != KAUTH_NETWORK_INTERFACE) return result; Index: src/sys/netsmb/smb_conn.c diff -u src/sys/netsmb/smb_conn.c:1.30 src/sys/netsmb/smb_conn.c:1.31 --- src/sys/netsmb/smb_conn.c:1.30 Mon Apr 15 21:00:33 2019 +++ src/sys/netsmb/smb_conn.c Fri Feb 21 00:26:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: smb_conn.c,v 1.30 2019/04/15 21:00:33 christos Exp $ */ +/* $NetBSD: smb_conn.c,v 1.31 2020/02/21 00:26:23 joerg Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smb_conn.c,v 1.30 2019/04/15 21:00:33 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smb_conn.c,v 1.31 2020/02/21 00:26:23 joerg Exp $"); /* * Connection engine. @@ -112,7 +112,7 @@ smb_listener_cb(kauth_cred_t cred, kauth return KAUTH_RESULT_DEFER; result = KAUTH_RESULT_DEFER; - req = (enum kauth_network_req)arg0; + req = (enum kauth_network_req)(uintptr_t)arg0; switch (req) { case KAUTH_REQ_NETWORK_SMB_SHARE_ACCESS: { Index: src/sys/secmodel/extensions/secmodel_extensions.c diff -u src/sys/secmodel/extensions/secmodel_extensions.c:1.10 src/sys/secmodel/extensions/secmodel_extensions.c:1.11 --- src/sys/secmodel/extensions/secmodel_extensions.c:1.10 Tue Sep 4 14:31:19 2018 +++ src/sys/secmodel/extensions/secmodel_extensions.c Fri Feb 21 00:26:23 2020 @@ -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 <e...@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 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_cre 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_cre 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) Index: src/sys/secmodel/keylock/secmodel_keylock.c diff -u src/sys/secmodel/keylock/secmodel_keylock.c:1.9 src/sys/secmodel/keylock/secmodel_keylock.c:1.10 --- src/sys/secmodel/keylock/secmodel_keylock.c:1.9 Sun Jul 15 05:16:45 2018 +++ src/sys/secmodel/keylock/secmodel_keylock.c Fri Feb 21 00:26:23 2020 @@ -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 <m...@msys.ch> * Copyright (c) 2006 Elad Efrat <e...@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 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 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 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 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); Index: src/sys/secmodel/securelevel/secmodel_securelevel.c diff -u src/sys/secmodel/securelevel/secmodel_securelevel.c:1.32 src/sys/secmodel/securelevel/secmodel_securelevel.c:1.33 --- src/sys/secmodel/securelevel/secmodel_securelevel.c:1.32 Sun Jul 15 05:16:45 2018 +++ src/sys/secmodel/securelevel/secmodel_securelevel.c Fri Feb 21 00:26:23 2020 @@ -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 <e...@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_cre 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_cr 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_cr 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_cre 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); Index: src/sys/secmodel/suser/secmodel_suser.c diff -u src/sys/secmodel/suser/secmodel_suser.c:1.50 src/sys/secmodel/suser/secmodel_suser.c:1.51 --- src/sys/secmodel/suser/secmodel_suser.c:1.50 Wed Apr 10 18:49:04 2019 +++ src/sys/secmodel/suser/secmodel_suser.c Fri Feb 21 00:26:23 2020 @@ -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 <e...@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 cr 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 c 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 c 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 cr 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: