CVS commit: src/sys/dev/nvmm/x86
Module Name:src Committed By: maxv Date: Thu Nov 22 07:37:12 UTC 2018 Modified Files: src/sys/dev/nvmm/x86: nvmm_x86_svm.c Log Message: Add missing pmap_update after pmap_kenter_pa, noted by Kamil. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/nvmm/x86/nvmm_x86_svm.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/dev/nvmm/x86/nvmm_x86_svm.c diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.4 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.5 --- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.4 Mon Nov 19 17:35:12 2018 +++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Thu Nov 22 07:37:12 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: nvmm_x86_svm.c,v 1.4 2018/11/19 17:35:12 maxv Exp $ */ +/* $NetBSD: nvmm_x86_svm.c,v 1.5 2018/11/22 07:37:12 maxv Exp $ */ /* * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.4 2018/11/19 17:35:12 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.5 2018/11/22 07:37:12 maxv Exp $"); #include #include @@ -1234,6 +1234,7 @@ svm_memalloc(paddr_t *pa, vaddr_t *va, s pmap_kenter_pa(_va + i * PAGE_SIZE, _pa + i * PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE, PMAP_WRITE_BACK); } + pmap_update(pmap_kernel()); memset((void *)_va, 0, npages * PAGE_SIZE);
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: msaitoh
Date: Thu Nov 22 06:15:06 UTC 2018
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Decode Intel/AMD MONITOR/MWAIT leaf.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.88 src/usr.sbin/cpuctl/arch/i386.c:1.89
--- src/usr.sbin/cpuctl/arch/i386.c:1.88 Wed Nov 21 12:19:51 2018
+++ src/usr.sbin/cpuctl/arch/i386.c Thu Nov 22 06:15:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.88 2018/11/21 12:19:51 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.89 2018/11/22 06:15:06 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.88 2018/11/21 12:19:51 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.89 2018/11/22 06:15:06 msaitoh Exp $");
#endif /* not lint */
#include
@@ -2160,6 +2160,29 @@ identifycpu(int fd, const char *cpuname)
identifycpu_cpuids(ci);
+ if ((ci->ci_cpuid_level >= 5)
+ && ((cpu_vendor == CPUVENDOR_INTEL)
+ || (cpu_vendor == CPUVENDOR_AMD))) {
+ uint16_t lmin, lmax;
+ x86_cpuid(5, descs);
+
+ print_bits(cpuname, "MONITOR/MWAIT extensions",
+ CPUID_MON_FLAGS, descs[2]);
+ lmin = __SHIFTOUT(descs[0], CPUID_MON_MINSIZE);
+ lmax = __SHIFTOUT(descs[1], CPUID_MON_MAXSIZE);
+ aprint_normal("%s: monitor-line size %hu", cpuname, lmin);
+ if (lmin != lmax)
+ aprint_normal("-%hu", lmax);
+ aprint_normal("\n");
+
+ for (i = 0; i <= 7; i++) {
+ unsigned int num = CPUID_MON_SUBSTATE(descs[3], i);
+
+ if (num != 0)
+aprint_normal("%s: C%u substates %u\n",
+cpuname, i, num);
+ }
+ }
if ((ci->ci_cpuid_level >= 6)
&& ((cpu_vendor == CPUVENDOR_INTEL)
|| (cpu_vendor == CPUVENDOR_AMD))) {
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Thu Nov 22 06:14:35 UTC 2018 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add Intel/AMD MONITOR/MWAIT leaf. To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.134 src/sys/arch/x86/include/specialreg.h:1.135 --- src/sys/arch/x86/include/specialreg.h:1.134 Wed Nov 21 12:18:53 2018 +++ src/sys/arch/x86/include/specialreg.h Thu Nov 22 06:14:35 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.134 2018/11/21 12:18:53 msaitoh Exp $ */ +/* $NetBSD: specialreg.h,v 1.135 2018/11/22 06:14:35 msaitoh Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -282,6 +282,24 @@ #define CPUID_DCP_COMPLEX __BIT(2) /* Complex cache indexing */ /* + * Intel/AMD MONITOR/MWAIT + * Fn_0005 + */ +/* %eax */ +#define CPUID_MON_MINSIZE __BITS(15, 0) /* Smallest monitor-line size */ +/* %ebx */ +#define CPUID_MON_MAXSIZE __BITS(15, 0) /* Largest monitor-line size */ +/* %ecx */ +#define CPUID_MON_EMX __BIT(0) /* MONITOR/MWAIT Extensions */ +#define CPUID_MON_IBE __BIT(1) /* Interrupt as Break Event */ + +#define CPUID_MON_FLAGS "\20" \ + "\1" "EMX" "\2" "IBE" + +/* %edx: number of substates for specific C-state */ +#define CPUID_MON_SUBSTATE(edx, cstate) (((edx) >> (cstate * 4)) & 0x000f) + +/* * Intel/AMD Digital Thermal Sensor and * Power Management, Fn_0006 - %eax. */
CVS commit: src/tests/net/ipsec
Module Name:src
Committed By: knakahara
Date: Thu Nov 22 04:51:41 UTC 2018
Modified Files:
src/tests/net/ipsec: natt_terminator.c t_ipsec_natt.sh
Log Message:
Add ATF for IPv6 NAT-T.
We use IPv6 NAT-T to avoid IPsec slowing down caused by dropping ESP packets
by some Customer Premises Equipments (CPE). I implement ATF to test such
situation.
I think it can also work with nat66, but I have not tested to the fine details.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/ipsec/natt_terminator.c \
src/tests/net/ipsec/t_ipsec_natt.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/ipsec/natt_terminator.c
diff -u src/tests/net/ipsec/natt_terminator.c:1.1 src/tests/net/ipsec/natt_terminator.c:1.2
--- src/tests/net/ipsec/natt_terminator.c:1.1 Mon Oct 30 15:59:23 2017
+++ src/tests/net/ipsec/natt_terminator.c Thu Nov 22 04:51:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: natt_terminator.c,v 1.1 2017/10/30 15:59:23 ozaki-r Exp $ */
+/* $NetBSD: natt_terminator.c,v 1.2 2018/11/22 04:51:41 knakahara Exp $ */
/*-
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -41,6 +41,14 @@
#include
#include
+static void
+usage(void)
+{
+ const char *prog = "natt_terminator";
+
+ fprintf(stderr, "Usage: %s [-46] \n", prog);
+}
+
int
main(int argc, char **argv)
{
@@ -49,17 +57,34 @@ main(int argc, char **argv)
int s, e;
const char *addr, *port;
int option;
+ int c, family = AF_INET;
+
+ while ((c = getopt(argc, argv, "46")) != -1) {
+ switch (c) {
+ case '4':
+ family = AF_INET;
+ break;
+ case '6':
+ family = AF_INET6;
+ break;
+ default:
+ usage();
+ return 1;
+ }
+ }
+ argc -= optind;
+ argv += optind;
- if (argc != 3) {
- fprintf(stderr, "Usage: %s \n", argv[0]);
+ if (argc != 2) {
+ usage();
return 1;
}
- addr = argv[1];
- port = argv[2];
+ addr = argv[0];
+ port = argv[1];
memset(, 0, sizeof(hints));
- hints.ai_family = AF_INET;
+ hints.ai_family = family;
hints.ai_socktype = SOCK_DGRAM;
hints.ai_protocol = IPPROTO_UDP;
hints.ai_flags = 0;
Index: src/tests/net/ipsec/t_ipsec_natt.sh
diff -u src/tests/net/ipsec/t_ipsec_natt.sh:1.1 src/tests/net/ipsec/t_ipsec_natt.sh:1.2
--- src/tests/net/ipsec/t_ipsec_natt.sh:1.1 Mon Oct 30 15:59:23 2017
+++ src/tests/net/ipsec/t_ipsec_natt.sh Thu Nov 22 04:51:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_natt.sh,v 1.1 2017/10/30 15:59:23 ozaki-r Exp $
+# $NetBSD: t_ipsec_natt.sh,v 1.2 2018/11/22 04:51:41 knakahara Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -31,11 +31,12 @@ SOCK_REMOTE=unix://ipsec_natt_remote
BUS_LOCAL=./bus_ipsec_natt_local
BUS_NAT=./bus_ipsec_natt_nat
BUS_REMOTE=./bus_ipsec_natt_remote
+BUS_GLOBAL=./bus_ipsec_natt_global
DEBUG=${DEBUG:-false}
HIJACKING_NPF="${HIJACKING},blanket=/dev/npf"
-setup_servers()
+setup_servers_ipv4()
{
rump_server_crypto_start $SOCK_LOCAL netipsec
@@ -47,6 +48,22 @@ setup_servers()
rump_server_add_iface $SOCK_REMOTE shmif0 $BUS_NAT
}
+setup_servers_ipv6()
+{
+
+ rump_server_crypto_start $SOCK_LOCAL netipsec netinet6 ipsec
+ rump_server_crypto_start $SOCK_REMOTE netipsec netinet6 ipsec
+ rump_server_add_iface $SOCK_LOCAL shmif0 $BUS_GLOBAL
+ rump_server_add_iface $SOCK_REMOTE shmif0 $BUS_GLOBAL
+}
+
+setup_servers()
+{
+ local proto=$1
+
+ setup_servers_$proto
+}
+
setup_sp()
{
local proto=$1
@@ -151,17 +168,24 @@ PIDSFILE=./terminator.pids
start_natt_terminator()
{
local sock=$1
- local ip=$2
- local port=$3
- local pidsfile=$4
+ local proto=$2
+ local ip=$3
+ local port=$4
+ local pidsfile=$5
local backup=$RUMP_SERVER
- local pid=
+ local pid= opt=
local terminator="$(atf_get_srcdir)/natt_terminator"
+ if [ "$proto" = "ipv6" ]; then
+ opt="-6"
+ else
+ opt="-4"
+ fi
+
export RUMP_SERVER=$sock
env LD_PRELOAD=/usr/lib/librumphijack.so \
- $terminator $ip $port &
+ $terminator $opt $ip $port &
pid=$!
if [ ! -f $PIDSFILE ]; then
touch $PIDSFILE
@@ -189,7 +213,7 @@ stop_natt_terminators()
rm -f $PIDSFILE
}
-test_ipsec_natt_transport()
+test_ipsec_natt_transport_ipv4()
{
local algo=$1
local ip_local=10.0.1.2
@@ -204,7 +228,7 @@ test_ipsec_natt_transport()
local algo_args="$(generate_algo_args esp-udp $algo)"
local pid= port=
- setup_servers
+ setup_servers ipv4
export RUMP_SERVER=$SOCK_LOCAL
atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.dad_count=0
@@ -278,7 +302,7 @@ test_ipsec_natt_transport()
cat $outfile
# Launch a nc server as a terminator of NAT-T on outside the NAPT
- start_natt_terminator $SOCK_REMOTE $ip_remote 4500
+ start_natt_terminator $SOCK_REMOTE ipv4 $ip_remote 4500
echo zzz > $file_send
export RUMP_SERVER=$SOCK_LOCAL
@@ -288,7 +312,7 @@ test_ipsec_natt_transport()
nc -u -w 3 -p 4500 $ip_remote 4500 < $file_send
# Launch a nc server as a terminator of NAT-T on inside the
CVS commit: src/sys
Module Name:src
Committed By: knakahara
Date: Thu Nov 22 04:48:34 UTC 2018
Modified Files:
src/sys/netinet: udp_usrreq.c
src/sys/netinet6: in6_pcb.h udp6_usrreq.c udp6_var.h
src/sys/netipsec: ipsec.c ipsec.h ipsec_output.c
Log Message:
Support IPv6 NAT-T. Implemented by hsuenaga@IIJ and ohishi@IIJ.
Add ATF later.
To generate a diff of this commit:
cvs rdiff -u -r1.256 -r1.257 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.49 -r1.50 src/sys/netinet6/in6_pcb.h
cvs rdiff -u -r1.143 -r1.144 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.29 -r1.30 src/sys/netinet6/udp6_var.h
cvs rdiff -u -r1.166 -r1.167 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.85 -r1.86 src/sys/netipsec/ipsec.h
cvs rdiff -u -r1.80 -r1.81 src/sys/netipsec/ipsec_output.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/netinet/udp_usrreq.c
diff -u src/sys/netinet/udp_usrreq.c:1.256 src/sys/netinet/udp_usrreq.c:1.257
--- src/sys/netinet/udp_usrreq.c:1.256 Fri Sep 14 05:09:51 2018
+++ src/sys/netinet/udp_usrreq.c Thu Nov 22 04:48:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_usrreq.c,v 1.256 2018/09/14 05:09:51 maxv Exp $ */
+/* $NetBSD: udp_usrreq.c,v 1.257 2018/11/22 04:48:34 knakahara Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.256 2018/09/14 05:09:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.257 2018/11/22 04:48:34 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -413,7 +413,7 @@ udp_input(struct mbuf *m, int off, int p
in6_in_2_v4mapin6(>ip_dst, _addr);
dst6.sin6_port = uh->uh_dport;
- n += udp6_realinput(AF_INET, , , m, iphlen);
+ n += udp6_realinput(AF_INET, , , , iphlen);
}
#endif
Index: src/sys/netinet6/in6_pcb.h
diff -u src/sys/netinet6/in6_pcb.h:1.49 src/sys/netinet6/in6_pcb.h:1.50
--- src/sys/netinet6/in6_pcb.h:1.49 Thu Mar 2 05:26:24 2017
+++ src/sys/netinet6/in6_pcb.h Thu Nov 22 04:48:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.h,v 1.49 2017/03/02 05:26:24 ozaki-r Exp $ */
+/* $NetBSD: in6_pcb.h,v 1.50 2018/11/22 04:48:34 knakahara Exp $ */
/* $KAME: in6_pcb.h,v 1.45 2001/02/09 05:59:46 itojun Exp $ */
/*
@@ -137,6 +137,8 @@ struct in6pcb {
#define IN6P_LOWPORT 0x200 /* user wants "low" port binding */
#define IN6P_ANONPORT 0x400 /* port chosen for user */
#define IN6P_FAITH 0x800 /* accept FAITH'ed connections */
+/* XXX should move to an UDP control block */
+#define IN6P_ESPINUDP INP_ESPINUDP /* ESP over UDP for NAT-T */
#define IN6P_RFC2292 0x4000 /* RFC2292 */
#define IN6P_MTU 0x8000 /* use minimum MTU */
Index: src/sys/netinet6/udp6_usrreq.c
diff -u src/sys/netinet6/udp6_usrreq.c:1.143 src/sys/netinet6/udp6_usrreq.c:1.144
--- src/sys/netinet6/udp6_usrreq.c:1.143 Tue Nov 6 04:27:41 2018
+++ src/sys/netinet6/udp6_usrreq.c Thu Nov 22 04:48:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udp6_usrreq.c,v 1.143 2018/11/06 04:27:41 ozaki-r Exp $ */
+/* $NetBSD: udp6_usrreq.c,v 1.144 2018/11/22 04:48:34 knakahara Exp $ */
/* $KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $ */
/* $KAME: udp6_output.c,v 1.43 2001/10/15 09:19:52 itojun Exp $ */
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.143 2018/11/06 04:27:41 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.144 2018/11/22 04:48:34 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -109,6 +109,7 @@ __KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.
#ifdef IPSEC
#include
+#include
#ifdef INET6
#include
#endif
@@ -135,6 +136,10 @@ static int udp6_recvspace = 40 * (1024 +
static void udp6_notify(struct in6pcb *, int);
static void sysctl_net_inet6_udp6_setup(struct sysctllog **);
+#ifdef IPSEC
+static int udp6_espinudp(struct mbuf **, int, struct sockaddr *,
+ struct socket *);
+#endif
#ifdef UDP_CSUM_COUNTERS
#include
@@ -298,7 +303,9 @@ udp6_ctloutput(int op, struct socket *so
{
int s;
int error = 0;
+ struct in6pcb *in6p;
int family;
+ int optval;
family = so->so_proto->pr_domain->dom_family;
@@ -324,7 +331,42 @@ udp6_ctloutput(int op, struct socket *so
error = EAFNOSUPPORT;
goto end;
}
- error = EINVAL;
+
+ switch (op) {
+ case PRCO_SETOPT:
+ in6p = sotoin6pcb(so);
+
+ switch (sopt->sopt_name) {
+ case UDP_ENCAP:
+ error = sockopt_getint(sopt, );
+ if (error)
+break;
+
+ switch(optval) {
+ case 0:
+in6p->in6p_flags &= ~IN6P_ESPINUDP;
+break;
+
+ case UDP_ENCAP_ESPINUDP:
+in6p->in6p_flags |= IN6P_ESPINUDP;
+break;
+
+ default:
+error = EINVAL;
+break;
+ }
+ break;
+
+ default:
+ error = ENOPROTOOPT;
+ break;
+ }
+ break;
+
+ default:
+ error = EINVAL;
+ break;
+ }
end:
splx(s);
@@ -374,7 +416,7 @@ udp6_sendup(struct mbuf *m, int off /* o
int
udp6_realinput(int af, struct sockaddr_in6
CVS commit: src/usr.bin/menuc
Module Name:src
Committed By: uwe
Date: Wed Nov 21 22:42:27 UTC 2018
Modified Files:
src/usr.bin/menuc: menuc.1
Log Message:
Try to provide the typesetting help requested.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/menuc/menuc.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/menuc/menuc.1
diff -u src/usr.bin/menuc/menuc.1:1.32 src/usr.bin/menuc/menuc.1:1.33
--- src/usr.bin/menuc/menuc.1:1.32 Wed Nov 21 20:04:48 2018
+++ src/usr.bin/menuc/menuc.1 Wed Nov 21 22:42:26 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: menuc.1,v 1.32 2018/11/21 20:04:48 martin Exp $
+.\" $NetBSD: menuc.1,v 1.33 2018/11/21 22:42:26 uwe Exp $
.\"
.\" Copyright 1997 Piermont Information Systems Inc.
.\" All rights reserved.
@@ -50,14 +50,6 @@ The standard base name of the files is
The
.Fl o Ar name
can be used to specify a different base name.
-.Sh ENVIRONMENT
-.Bl -tag -width MENUDEF
-.It Ev MENUDEF
-Can be set to point to a different set of definition files for
-.Nm .
-The current location defaults to
-.Pa /usr/share/misc .
-.El
.Sh MENU DESCRIPTIONS
The input
.Ar file
@@ -66,18 +58,16 @@ It also contains comments, initial C cod
for definitions and other code necessary for the menu system, and an
option declaration if dynamic menus are requested.
.Pp
-Comments may appear anywhere in the input
-.Ar file
+Comments may appear anywhere in the input file
and are like a space in the input.
They are like C comments starting with
-.Em /*
+.Li "/*"
and ending with
-.Em */ .
+.Li "*/" .
They are unlike C comments in that they may be nested.
A comment does not end until a matching end comment is found.
.Pp
-In many places, C code is included in the definition
-.Ar file .
+In many places, C code is included in the definition file.
All C code is passed verbatim to the C output file.
.Nm
comments do not start in C code and comments in the C code are
@@ -85,26 +75,24 @@ passed verbatim to the output.
The C comments are not recognized by
.Nm .
In all cases, C code starts with a left brace
-.Pq Em \&{
+.Pq Ql \&{
and ends with the matching right brace
-.Pq Em \&} .
+.Pq Ql \&} .
It is important to recognize that in code segments, any brace
will be counted, even if it is in a C comment inside the code.
.Pp
-The
-.Ar file
+The file
contains an initial (and optional) code block followed by any
number of menu definition elements in any order.
The initial code block usually contains includes of header files used by
-code in the menu code blocks later in the
-.Ar file .
+code in the menu code blocks later in the file.
If
.Dv USER_MENU_INIT
-is #defined, then it will be evaluated before the
+preprocessor symbol
+is defined, then it will be evaluated before the
rest of the menu is initialised, if it evaluates to a non-zero value
then the initialisation will fail.
-The file is free format, so the actual formatting of the input
-.Ar file
+The file is free format, so the actual formatting of the input file
is to the taste of the programmer.
.Pp
All other C code that will appear in an
@@ -113,15 +101,16 @@ This will be specified as
.Aq Em action
in later text.
Such an action will appear as:
-.Dl action
-in the
-.Ar file .
+.Pp
+.D1 Li action Ao Em opt_endwin Ac Ao Em code Ac
+.Pp
+in the file.
The
.Aq Em opt_endwin ,
-if present is:
-.Dl ( endwin )
+is optional
+.Ql "(endwin)"
and specifies that the curses
-.Fn endwin
+.Xr endwin 3
function should be called before executing the code and
then reinstating the current curses window after the
code has been run.
@@ -139,54 +128,56 @@ change at run time.
Dynamic menus provide the programmer with a method to create and
modify menus during the running of the program.
To include dynamic menus, one needs only add the declaration:
-.Dl allow dynamic menus ;
+.Pp
+.Dl "allow dynamic menus;"
+.Pp
The semicolon is required to terminate this declaration.
-This declaration may appear anywhere in the
-.Ar file ,
+This declaration may appear anywhere in the file,
but usually appears before any menus are defined.
See below for a detailed explanation of dynamic menus.
.Pp
-To allow dynamic messages, one needs to add the declaration:
-.Dl allow dynamic messages ;
-This enables internationalization by loading message files at
-run time.
-.Pp
-To allow argument expansion on static menu strings, one needs to add
-the declaration:
-.Dl allow expand ;
-This enables the expand action.
-See below for a detailed explanation.
+To enable internationalization by loading message files at
+run time one needs to add the declaration:
+.Pp
+.Dl "allow dynamic messages;"
+.Pp
+To allow argument expansion on static menu strings (see below for a
+detailed explanation), one needs to add the declaration:
+.Pp
+.Dl "allow expand;"
.Pp
The next element is a code block to execute if the curses
screen can not be successfully initialized.
The
CVS commit: src/lib/libc/arch/aarch64/gen
Module Name:src
Committed By: skrll
Date: Wed Nov 21 21:24:42 UTC 2018
Modified Files:
src/lib/libc/arch/aarch64/gen: _lwp.c
Log Message:
_REG_LR should be _lwp_exit
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/aarch64/gen/_lwp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/aarch64/gen/_lwp.c
diff -u src/lib/libc/arch/aarch64/gen/_lwp.c:1.2 src/lib/libc/arch/aarch64/gen/_lwp.c:1.3
--- src/lib/libc/arch/aarch64/gen/_lwp.c:1.2 Sat Aug 4 10:22:09 2018
+++ src/lib/libc/arch/aarch64/gen/_lwp.c Wed Nov 21 21:24:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: _lwp.c,v 1.2 2018/08/04 10:22:09 ryo Exp $ */
+/* $NetBSD: _lwp.c,v 1.3 2018/11/21 21:24:42 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _lwp.c,v 1.2 2018/08/04 10:22:09 ryo Exp $");
+__RCSID("$NetBSD: _lwp.c,v 1.3 2018/11/21 21:24:42 skrll Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -58,7 +58,7 @@ _lwp_makecontext(ucontext_t *u, void (*s
u->uc_mcontext.__gregs[_REG_X0] = (__greg_t)(uintptr_t)arg;
u->uc_mcontext.__gregs[_REG_SP] = ((__greg_t)sp) & -16;
- u->uc_mcontext.__gregs[_REG_X29] = (__greg_t)(uintptr_t)_lwp_exit;
+ u->uc_mcontext.__gregs[_REG_LR] = (__greg_t)(uintptr_t)_lwp_exit;
u->uc_mcontext.__gregs[_REG_PC] = (__greg_t)(uintptr_t)start;
u->uc_mcontext.__gregs[_REG_TPIDR] = (__greg_t)(uintptr_t)private;
u->uc_flags |= _UC_TLSBASE;
CVS commit: src/lib/libc/arch/aarch64/gen
Module Name:src
Committed By: skrll
Date: Wed Nov 21 21:04:15 UTC 2018
Modified Files:
src/lib/libc/arch/aarch64/gen: swapcontext.S
Log Message:
Fix some register names in comments
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/aarch64/gen/swapcontext.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/aarch64/gen/swapcontext.S
diff -u src/lib/libc/arch/aarch64/gen/swapcontext.S:1.1 src/lib/libc/arch/aarch64/gen/swapcontext.S:1.2
--- src/lib/libc/arch/aarch64/gen/swapcontext.S:1.1 Sun Aug 10 05:47:36 2014
+++ src/lib/libc/arch/aarch64/gen/swapcontext.S Wed Nov 21 21:04:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: swapcontext.S,v 1.1 2014/08/10 05:47:36 matt Exp $ */
+/* $NetBSD: swapcontext.S,v 1.2 2018/11/21 21:04:15 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,14 +33,14 @@
#include "assym.h"
#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: swapcontext.S,v 1.1 2014/08/10 05:47:36 matt Exp $")
+RCSID("$NetBSD: swapcontext.S,v 1.2 2018/11/21 21:04:15 skrll Exp $")
#endif /* LIBC_SCCS && !lint */
/* LINTSTUB: int swapcontext(ucontext_t * restrict, ucontext_t * restrict); */
ENTRY(swapcontext)
sub sp, sp, #32 /* allocate stack frame */
- stp x29, x30, [sp, #16] /* save FP & RA */
+ stp x29, x30, [sp, #16] /* save FP & LR */
add x29, sp, #16 /* new FP */
stp x0, x1, [sp, #0] /* save oucp & ucp */
@@ -48,7 +48,7 @@ ENTRY(swapcontext)
mov x3, x0 /* save return value */
ldp x2, x0, [sp, #0] /* restore oucp & ucp */
- ldp x29, x30, [sp, #16] /* restore FP & RA */
+ ldp x29, x30, [sp, #16] /* restore FP & LR */
add sp, sp, #32 /* free stack frame */
/*
@@ -56,7 +56,7 @@ ENTRY(swapcontext)
*/
mov x4, sp /* Get SP */
str x4, [x2, #_UC_REGS_SP] /* Adjust saved SP. */
- str x30, [x2, #_UC_REGS_PC] /* Adjust saved LR. */
+ str x30, [x2, #_UC_REGS_PC] /* Adjust saved PC. */
cbz x3, _C_LABEL(setcontext)/* setcontext if getcontext succeeded */
mov x0, x3 /* restore getcontext return value */
CVS commit: src/lib/libc/arch/arm/gen
Module Name:src
Committed By: skrll
Date: Wed Nov 21 21:01:41 UTC 2018
Modified Files:
src/lib/libc/arch/arm/gen: swapcontext.S
Log Message:
Fix a comment
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/arch/arm/gen/swapcontext.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/arm/gen/swapcontext.S
diff -u src/lib/libc/arch/arm/gen/swapcontext.S:1.14 src/lib/libc/arch/arm/gen/swapcontext.S:1.15
--- src/lib/libc/arch/arm/gen/swapcontext.S:1.14 Sat Nov 30 20:20:42 2013
+++ src/lib/libc/arch/arm/gen/swapcontext.S Wed Nov 21 21:01:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: swapcontext.S,v 1.14 2013/11/30 20:20:42 joerg Exp $ */
+/* $NetBSD: swapcontext.S,v 1.15 2018/11/21 21:01:41 skrll Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include "assym.h"
#if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: swapcontext.S,v 1.14 2013/11/30 20:20:42 joerg Exp $")
+RCSID("$NetBSD: swapcontext.S,v 1.15 2018/11/21 21:01:41 skrll Exp $")
#endif /* LIBC_SCCS && !lint */
ENTRY(swapcontext)
@@ -70,7 +70,7 @@ ENTRY(swapcontext)
#endif
#if !defined(__thumb__)
str sp, [r0, #_UC_REGS_SP] /* Adjust saved SP. */
- str lr, [r0, #_UC_REGS_PC] /* Adjust saved SP. */
+ str lr, [r0, #_UC_REGS_PC] /* Adjust saved PC. */
#else
mov r2, sp
str r2, [r0, #_UC_REGS_SP] /* Adjust saved SP. */
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src
Committed By: macallan
Date: Wed Nov 21 20:36:41 UTC 2018
Modified Files:
src/sys/arch/iyonix/iyonix: autoconf.c
Log Message:
- RISC OS hands us the graphics hardware in BGR mode when running 32bit colour
pass that info on to genfb/gffb so X can show colours correctly
- set genfb properties on gffb as well
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/iyonix/iyonix/autoconf.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/arch/iyonix/iyonix/autoconf.c
diff -u src/sys/arch/iyonix/iyonix/autoconf.c:1.15 src/sys/arch/iyonix/iyonix/autoconf.c:1.16
--- src/sys/arch/iyonix/iyonix/autoconf.c:1.15 Sat Oct 27 17:17:58 2012
+++ src/sys/arch/iyonix/iyonix/autoconf.c Wed Nov 21 20:36:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.15 2012/10/27 17:17:58 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.16 2018/11/21 20:36:41 macallan Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2012/10/27 17:17:58 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.16 2018/11/21 20:36:41 macallan Exp $");
#include "opt_md.h"
@@ -138,7 +138,7 @@ device_register(device_t dev, void *aux)
}
}
- if (device_is_a(dev, "genfb") &&
+ if ((device_is_a(dev, "genfb") || device_is_a(dev, "gffb")) &&
device_is_a(device_parent(dev), "pci") ) {
prop_dictionary_t dict = device_properties(dev);
struct pci_attach_args *pa = aux;
@@ -178,6 +178,13 @@ device_register(device_t dev, void *aux)
bootconfig.height + 1);
prop_dictionary_set_uint32(dict, "depth",
1 << bootconfig.log2_bpp);
+ /*
+ * XXX
+ * at least RISC OS 5.28 seems to use the graphics hardware in
+ * BGR mode when in 32bit colour, so take that into account
+ */
+ if (bootconfig.log2_bpp == 5)
+ prop_dictionary_set_bool(dict, "is_bgr", 1);
prop_dictionary_set_uint32(dict, "address", fbaddr);
}
}
CVS commit: src/usr.sbin/etcupdate
Module Name:src Committed By: martin Date: Wed Nov 21 20:18:12 UTC 2018 Modified Files: src/usr.sbin/etcupdate: etcupdate.8 Log Message: A few hints that sets may come in .tar.xz format (instead of .tgz) To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/etcupdate/etcupdate.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/etcupdate/etcupdate.8 diff -u src/usr.sbin/etcupdate/etcupdate.8:1.22 src/usr.sbin/etcupdate/etcupdate.8:1.23 --- src/usr.sbin/etcupdate/etcupdate.8:1.22 Thu Jun 12 14:07:13 2014 +++ src/usr.sbin/etcupdate/etcupdate.8 Wed Nov 21 20:18:11 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: etcupdate.8,v 1.22 2014/06/12 14:07:13 apb Exp $ +.\" $NetBSD: etcupdate.8,v 1.23 2018/11/21 20:18:11 martin Exp $ .\" .\" Copyright (c) 2001-2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 12, 2014 +.Dd November 20, 2018 .Dt ETCUPDATE 8 .Os .Sh NAME @@ -204,9 +204,13 @@ extracted from a binary distribution of .Nx . The files that are distributed in the .Dq Pa etc.tgz +or +.Dq Pa etc.tar.xz set file must be present. The files that are distributed in the .Dq Pa xetc.tgz +or +.Dq Pa xetc.tar.xz set file are optional. The reference files from the specified directory will be copied to the .Pa temproot @@ -216,7 +220,8 @@ The location of a set file (or .Dq "tgz file" ) such as -.Dq Pa etc.tgz +.Dq Pa etc.tgz , +.Dq Pa etc.tar.xz or .Dq Pa xetc.tgz from a binary distribution of @@ -230,9 +235,13 @@ Multiple options may be used to specify multiple set files. The .Dq Pa etc.tgz +or +.Dq Pa etc.tar.xz set file must be specified. The .Dq Pa xetc.tgz +or +.Dq Pa xetc.tar.xz set file is optional. .El .It Fl t Ar temproot
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: martin Date: Wed Nov 21 20:13:09 UTC 2018 Modified Files: src/usr.sbin/postinstall: postinstall.8 Log Message: Sprinkle a few references to .tar.xz files (as alternative to .tgz files) To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/postinstall/postinstall.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall.8 diff -u src/usr.sbin/postinstall/postinstall.8:1.19 src/usr.sbin/postinstall/postinstall.8:1.20 --- src/usr.sbin/postinstall/postinstall.8:1.19 Mon Jul 3 21:35:31 2017 +++ src/usr.sbin/postinstall/postinstall.8 Wed Nov 21 20:13:09 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: postinstall.8,v 1.19 2017/07/03 21:35:31 wiz Exp $ +.\" $NetBSD: postinstall.8,v 1.20 2018/11/21 20:13:09 martin Exp $ .\" .\" Copyright (c) 2005-2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 21, 2014 +.Dd November 20, 2018 .Dt POSTINSTALL 8 .Os .Sh NAME @@ -91,14 +91,20 @@ extracted from a binary distribution of .Nx . The files that are distributed in the .Dq Pa etc.tgz +or +.Dq Pa etc.tar.xz set file must be present. The files that are distributed in the .Dq Pa xetc.tgz +or +.Dq Pa xetc.tar.xz set file are optional. .It Fl s Ar tgzfile The location of a set file (or -.Dq "tgz file" ) +.Dq "tgz file" +or +.Dq "tar.xz file" ) such as .Dq Pa etc.tgz or
CVS commit: src/usr.bin/menuc
Module Name:src
Committed By: martin
Date: Wed Nov 21 20:04:48 UTC 2018
Modified Files:
src/usr.bin/menuc: defs.h mdb.c mdb.h menu_sys.def menuc.1 parse.y
scan.l
Log Message:
Add (optional) support for expanded static menu texts - that is: whatever
the application programmer defines as expansion, e.g. to implement
parameter substitution.
While here add rudimentary documentation of the dynamic messages
feature (so at least the parser and the syntax documented here
are in sync).
The man page could use some typesetting help...
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/menuc/defs.h
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/menuc/mdb.c
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/menuc/mdb.h
cvs rdiff -u -r1.59 -r1.60 src/usr.bin/menuc/menu_sys.def
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/menuc/menuc.1
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/menuc/parse.y src/usr.bin/menuc/scan.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/menuc/defs.h
diff -u src/usr.bin/menuc/defs.h:1.10 src/usr.bin/menuc/defs.h:1.11
--- src/usr.bin/menuc/defs.h:1.10 Fri Oct 18 20:19:36 2013
+++ src/usr.bin/menuc/defs.h Wed Nov 21 20:04:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.10 2013/10/18 20:19:36 christos Exp $ */
+/* $NetBSD: defs.h,v 1.11 2018/11/21 20:04:48 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -65,6 +65,7 @@ EXTERN char *sys_name INIT("menu_sys.def
EXTERN int do_dynamic INIT(0);
EXTERN int do_msgxlat INIT(0);
+EXTERN int do_expands INIT(0);
EXTERN int line_no INIT(1);
EXTERN int had_errors INIT(FALSE);
EXTERN int max_strlen INIT(1);
Index: src/usr.bin/menuc/mdb.c
diff -u src/usr.bin/menuc/mdb.c:1.46 src/usr.bin/menuc/mdb.c:1.47
--- src/usr.bin/menuc/mdb.c:1.46 Tue Mar 6 16:55:18 2012
+++ src/usr.bin/menuc/mdb.c Wed Nov 21 20:04:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mdb.c,v 1.46 2012/03/06 16:55:18 mbalmer Exp $ */
+/* $NetBSD: mdb.c,v 1.47 2018/11/21 20:04:48 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,7 +41,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mdb.c,v 1.46 2012/03/06 16:55:18 mbalmer Exp $");
+__RCSID("$NetBSD: mdb.c,v 1.47 2018/11/21 20:04:48 martin Exp $");
#endif
@@ -163,6 +163,8 @@ write_menu_file(char *initcode)
(void)fprintf(out_file, "#define MSG_XLAT(x) (x)\n");
if (do_dynamic)
(void)fprintf(out_file, "#define DYNAMIC_MENUS\n");
+ if (do_expands)
+ (void)fprintf(out_file, "#define MENU_EXPANDS\n");
if (do_dynamic || do_msgxlat)
(void)fprintf(out_file, "\n");
@@ -171,6 +173,9 @@ write_menu_file(char *initcode)
"typedef struct menu_ent menu_ent;\n"
"struct menu_ent {\n"
" const char *opt_name;\n"
+ "#ifdef MENU_EXPANDS\n"
+ " const char *opt_exp_name;\n"
+ "#endif\n"
" int opt_menu;\n"
" int opt_flags;\n"
" int (*opt_action)(menudesc *, void *);\n"
@@ -192,7 +197,12 @@ write_menu_file(char *initcode)
" WINDOW *mw;\n"
" WINDOW *sv_mw;\n"
" const char *helpstr;\n"
- " const char *exitstr;\n"
+ " const char *exitstr;\n");
+ if (do_expands)
+ (void)fprintf(out_file,
+ " void (*expand_act)(menudesc *, "
+ "void *);\n");
+ (void)fprintf(out_file,
" void (*post_act)(menudesc *, void *);\n"
" void (*exit_act)(menudesc *, void *);\n"
" void (*draw_line)(menudesc *, int, void *);\n"
@@ -263,6 +273,14 @@ write_menu_file(char *initcode)
/* func defs */
for (i = 0; i < menu_no; i++) {
+ if (do_expands && strlen(menus[i]->info->expact.code)) {
+ (void)fprintf(out_file, "/*ARGSUSED*/\n"
+ "static void menu_%d_expact(menudesc *menu, void *arg)\n{\n", i);
+ if (menus[i]->info->expact.endwin)
+(void)fprintf(out_file, "\tendwin();\n");
+ (void)fprintf(out_file, "\t%s\n}\n\n",
+ menus[i]->info->expact.code);
+ }
if (strlen(menus[i]->info->postact.code)) {
(void)fprintf(out_file, "/*ARGSUSED*/\n"
"static void menu_%d_postact(menudesc *menu, void *arg)\n{\n", i);
@@ -307,7 +325,8 @@ write_menu_file(char *initcode)
for (j = 0, toptn = menus[i]->info->optns; toptn;
toptn = toptn->next, j++) {
name_is_code += toptn->name_is_code;
- (void)fprintf(out_file, "\t{%s,%d,%d,",
+ (void)fprintf(out_file, "\t{ .opt_name = %s, "
+".opt_menu=%d, .opt_flags=%d, .opt_action=",
toptn->name_is_code ? "0" : toptn->name,
toptn->menu,
(toptn->issub ? OPT_SUB : 0)
@@ -380,6 +399,12 @@ write_menu_file(char *initcode)
(void)fprintf(out_file, "%s", menus[i]->info->exitstr);
else
(void)fprintf(out_file, "\"Exit\"");
+ if (do_expands) {
+ if (strlen(menus[i]->info->expact.code))
+(void)fprintf(out_file, ",menu_%d_expact", i);
+ else
+(void)fprintf(out_file, ",NULL");
+ }
if (strlen(menus[i]->info->postact.code))
(void)fprintf(out_file, ",menu_%d_postact", i);
else
@@ -397,7 +422,10 @@
CVS commit: src/sys/arch/arm/xscale
Module Name:src Committed By: macallan Date: Wed Nov 21 19:03:18 UTC 2018 Modified Files: src/sys/arch/arm/xscale: i80321_space.c Log Message: further de-cargocult the new mmap() methods To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/xscale/i80321_space.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/arch/arm/xscale/i80321_space.c diff -u src/sys/arch/arm/xscale/i80321_space.c:1.17 src/sys/arch/arm/xscale/i80321_space.c:1.18 --- src/sys/arch/arm/xscale/i80321_space.c:1.17 Wed Nov 21 09:49:39 2018 +++ src/sys/arch/arm/xscale/i80321_space.c Wed Nov 21 19:03:18 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_space.c,v 1.17 2018/11/21 09:49:39 thorpej Exp $ */ +/* $NetBSD: i80321_space.c,v 1.18 2018/11/21 19:03:18 macallan Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: i80321_space.c,v 1.17 2018/11/21 09:49:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80321_space.c,v 1.18 2018/11/21 19:03:18 macallan Exp $"); #include #include @@ -306,9 +306,6 @@ i80321_io_bs_mmap(void *t, bus_addr_t ad } else return (-1); - if ((bpa) >= (busbase + VERDE_OUT_XLATE_IO_WIN_SIZE)) - return (-1); - return (arm_btop(winpaddr + (bpa - busbase))); } @@ -460,9 +457,6 @@ i80321_mem_bs_mmap(void *t, bus_addr_t a physbase = VERDE_OUT_DIRECT_WIN_BASE; } else return (-1); - if (bpa >= (VERDE_OUT_DIRECT_WIN_BASE + - VERDE_OUT_DIRECT_WIN_SIZE)) - return (-1); #else if (bpa >= sc->sc_owin[0].owin_xlate_lo && bpa < (sc->sc_owin[0].owin_xlate_lo + @@ -471,8 +465,6 @@ i80321_mem_bs_mmap(void *t, bus_addr_t a physbase = sc->sc_iwin[1].iwin_xlate; } else return (-1); - if (bpa >= (busbase + VERDE_OUT_XLATE_MEM_WIN_SIZE)) - return (-1); #endif pa = trunc_page((bpa - busbase) + physbase);
CVS commit: src/sys/arch/powerpc/oea
Module Name:src
Committed By: scole
Date: Wed Nov 21 17:54:43 UTC 2018
Modified Files:
src/sys/arch/powerpc/oea: ofw_autoconf.c
Log Message:
don't bother reading ofw properties for platinumfb
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/oea/ofw_autoconf.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/arch/powerpc/oea/ofw_autoconf.c
diff -u src/sys/arch/powerpc/oea/ofw_autoconf.c:1.22 src/sys/arch/powerpc/oea/ofw_autoconf.c:1.23
--- src/sys/arch/powerpc/oea/ofw_autoconf.c:1.22 Fri Aug 17 15:54:35 2018
+++ src/sys/arch/powerpc/oea/ofw_autoconf.c Wed Nov 21 17:54:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_autoconf.c,v 1.22 2018/08/17 15:54:35 macallan Exp $ */
+/* $NetBSD: ofw_autoconf.c,v 1.23 2018/11/21 17:54:42 scole Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.22 2018/08/17 15:54:35 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.23 2018/11/21 17:54:42 scole Exp $");
#ifdef ofppc
#include "gtpci.h"
@@ -244,6 +244,11 @@ device_register(device_t dev, void *aux)
copy_disp_props(dev, ca->ca_node, dict);
}
+ /* cannot read useful display properties for platinum */
+ if (device_is_a(dev, "platinumfb")) {
+ return;
+ }
+
#if NGTPCI > 0
if (device_is_a(dev, "gtpci")) {
extern struct gtpci_prot gtpci0_prot, gtpci1_prot;
CVS commit: src/libexec/httpd
Module Name:src
Committed By: mrg
Date: Wed Nov 21 17:39:19 UTC 2018
Modified Files:
src/libexec/httpd: bozohttpd.c
Log Message:
use MAP_SHARED for the bzremap file. avoids netbsd kernel complaining:
WARNING: defaulted mmap() share type to MAP_PRIVATE (pid 15478 command
bozohttpd)
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/libexec/httpd/bozohttpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.91 src/libexec/httpd/bozohttpd.c:1.92
--- src/libexec/httpd/bozohttpd.c:1.91 Wed Nov 21 09:37:02 2018
+++ src/libexec/httpd/bozohttpd.c Wed Nov 21 17:39:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.91 2018/11/21 09:37:02 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.92 2018/11/21 17:39:19 mrg Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -1204,7 +1204,7 @@ check_mapping(bozo_httpreq_t *request)
return;
}
- fmap = mmap(NULL, st.st_size, PROT_READ, 0, mapfile, 0);
+ fmap = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, mapfile, 0);
if (fmap == NULL) {
bozowarn(httpd, "could not mmap " REMAP_FILE ", error %d",
errno);
CVS commit: [netbsd-7-0] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Wed Nov 21 14:13:47 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [netbsd-7-0]: netbsd32_socket.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1652):
sys/compat/netbsd32/netbsd32_socket.c: revision 1.48 (via patch)
Fix inverted logic, which leads to buffer overflow. Detected by kASan.
To generate a diff of this commit:
cvs rdiff -u -r1.41.14.1 -r1.41.14.1.2.1 \
src/sys/compat/netbsd32/netbsd32_socket.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_socket.c
diff -u src/sys/compat/netbsd32/netbsd32_socket.c:1.41.14.1 src/sys/compat/netbsd32/netbsd32_socket.c:1.41.14.1.2.1
--- src/sys/compat/netbsd32/netbsd32_socket.c:1.41.14.1 Sat Aug 8 15:41:54 2015
+++ src/sys/compat/netbsd32/netbsd32_socket.c Wed Nov 21 14:13:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_socket.c,v 1.41.14.1 2015/08/08 15:41:54 martin Exp $ */
+/* $NetBSD: netbsd32_socket.c,v 1.41.14.1.2.1 2018/11/21 14:13:47 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.41.14.1 2015/08/08 15:41:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.41.14.1.2.1 2018/11/21 14:13:47 martin Exp $");
#include
#include
@@ -99,7 +99,7 @@ copyout32_msg_control_mbuf(struct lwp *l
}
ktrkuser("msgcontrol", cmsg, cmsg->cmsg_len);
- error = copyout(, *q, MAX(i, sizeof(cmsg32)));
+ error = copyout(, *q, MIN(i, sizeof(cmsg32)));
if (error)
return (error);
if (i > CMSG32_LEN(0)) {
CVS commit: src/sys/arch/aarch64/include
Module Name:src
Committed By: jdolecek
Date: Wed Nov 21 12:34:21 UTC 2018
Modified Files:
src/sys/arch/aarch64/include: pmap.h
Log Message:
revert PMAP_DIRECT until tested; requested by mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/aarch64/include/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/include/pmap.h
diff -u src/sys/arch/aarch64/include/pmap.h:1.18 src/sys/arch/aarch64/include/pmap.h:1.19
--- src/sys/arch/aarch64/include/pmap.h:1.18 Tue Nov 20 20:53:50 2018
+++ src/sys/arch/aarch64/include/pmap.h Wed Nov 21 12:34:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.18 2018/11/20 20:53:50 jdolecek Exp $ */
+/* $NetBSD: pmap.h,v 1.19 2018/11/21 12:34:21 jdolecek Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -54,16 +54,6 @@
#ifndef KASAN
#define PMAP_MAP_POOLPAGE(pa) AARCH64_PA_TO_KVA(pa)
#define PMAP_UNMAP_POOLPAGE(va) AARCH64_KVA_TO_PA(va)
-
-#define PMAP_DIRECT
-static __inline int
-pmap_direct_process(paddr_t pa, voff_t pgoff, size_t len,
-int (*process)(void *, size_t, void *), void *arg)
-{
- vaddr_t va = AARCH64_PA_TO_KVA(pa);
-
- return process((void *)(va + pgoff), len, arg);
-}
#endif
struct pmap {
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: msaitoh
Date: Wed Nov 21 12:19:52 UTC 2018
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Decode package, core and SMT id if CPUID 0x0b is available on Intel processor.
If the value is different from the kernel value, we should fix the kernel code.
TODO: Use 0x1f if it's available.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.87 src/usr.sbin/cpuctl/arch/i386.c:1.88
--- src/usr.sbin/cpuctl/arch/i386.c:1.87 Wed Nov 21 10:34:53 2018
+++ src/usr.sbin/cpuctl/arch/i386.c Wed Nov 21 12:19:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.87 2018/11/21 10:34:53 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.88 2018/11/21 12:19:51 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.87 2018/11/21 10:34:53 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.88 2018/11/21 12:19:51 msaitoh Exp $");
#endif /* not lint */
#include
@@ -1786,23 +1786,14 @@ print_bits(const char *cpuname, const ch
}
static void
-identifycpu_cpuids(struct cpu_info *ci)
+identifycpu_cpuids_intel_0x04(struct cpu_info *ci)
{
- const char *cpuname = ci->ci_dev;
u_int lp_max = 1; /* logical processors per package */
u_int smt_max; /* smt per core */
u_int core_max = 1; /* core per package */
u_int smt_bits, core_bits;
uint32_t descs[4];
- aprint_verbose("%s: Initial APIC ID %u\n", cpuname, ci->ci_initapicid);
- ci->ci_packageid = ci->ci_initapicid;
- ci->ci_coreid = 0;
- ci->ci_smtid = 0;
- if (cpu_vendor != CPUVENDOR_INTEL) {
- return;
- }
-
/*
* 253668.pdf 7.10.2
*/
@@ -1811,32 +1802,110 @@ identifycpu_cpuids(struct cpu_info *ci)
x86_cpuid(1, descs);
lp_max = __SHIFTOUT(descs[1], CPUID_HTT_CORES);
}
- if (ci->ci_cpuid_level >= 4) {
- x86_cpuid2(4, 0, descs);
- core_max = __SHIFTOUT(descs[0], CPUID_DCP_CORE_P_PKG) + 1;
- }
+ x86_cpuid2(4, 0, descs);
+ core_max = __SHIFTOUT(descs[0], CPUID_DCP_CORE_P_PKG) + 1;
+
assert(lp_max >= core_max);
smt_max = lp_max / core_max;
smt_bits = ilog2(smt_max - 1) + 1;
core_bits = ilog2(core_max - 1) + 1;
- if (smt_bits + core_bits) {
+
+ if (smt_bits + core_bits)
ci->ci_packageid = ci->ci_initapicid >> (smt_bits + core_bits);
+
+ if (core_bits)
+ ci->ci_coreid = __SHIFTOUT(ci->ci_initapicid,
+ __BITS(smt_bits, smt_bits + core_bits - 1));
+
+ if (smt_bits)
+ ci->ci_smtid = __SHIFTOUT(ci->ci_initapicid,
+ __BITS((int)0, (int)(smt_bits - 1)));
+}
+
+static void
+identifycpu_cpuids_intel_0x0b(struct cpu_info *ci)
+{
+ const char *cpuname = ci->ci_dev;
+ u_int smt_bits, core_bits, core_shift = 0, pkg_shift = 0;
+ uint32_t descs[4];
+ int i;
+
+ x86_cpuid(0x0b, descs);
+ if (descs[1] == 0) {
+ identifycpu_cpuids_intel_0x04(ci);
+ return;
+ }
+
+ for (i = 0; ; i++) {
+ unsigned int shiftnum, lvltype;
+ x86_cpuid2(0x0b, i, descs);
+
+ /* On invalid level, (EAX and) EBX return 0 */
+ if (descs[1] == 0)
+ break;
+
+ shiftnum = __SHIFTOUT(descs[0], CPUID_TOP_SHIFTNUM);
+ lvltype = __SHIFTOUT(descs[2], CPUID_TOP_LVLTYPE);
+ switch (lvltype) {
+ case CPUID_TOP_LVLTYPE_SMT:
+ core_shift = shiftnum;
+ break;
+ case CPUID_TOP_LVLTYPE_CORE:
+ pkg_shift = shiftnum;
+ break;
+ case CPUID_TOP_LVLTYPE_INVAL:
+ aprint_verbose("%s: Invalid level type\n", cpuname);
+ break;
+ default:
+ aprint_verbose("%s: Unknown level type(%d) \n",
+ cpuname, lvltype);
+ break;
+ }
}
+
+ assert(pkg_shift >= core_shift);
+ smt_bits = core_shift;
+ core_bits = pkg_shift - core_shift;
+
+ ci->ci_packageid = ci->ci_initapicid >> pkg_shift;
+
+ if (core_bits)
+ ci->ci_coreid = __SHIFTOUT(ci->ci_initapicid,
+ __BITS(core_shift, pkg_shift - 1));
+
+ if (smt_bits)
+ ci->ci_smtid = __SHIFTOUT(ci->ci_initapicid,
+ __BITS((int)0, core_shift - 1));
+}
+
+static void
+identifycpu_cpuids_intel(struct cpu_info *ci)
+{
+ const char *cpuname = ci->ci_dev;
+
+ if (ci->ci_cpuid_level >= 0x0b)
+ identifycpu_cpuids_intel_0x0b(ci);
+ else if (ci->ci_cpuid_level >= 4)
+ identifycpu_cpuids_intel_0x04(ci);
+
aprint_verbose("%s: Cluster/Package ID %u\n", cpuname,
ci->ci_packageid);
- if (core_bits) {
- u_int core_mask = __BITS(smt_bits, smt_bits + core_bits - 1);
+ aprint_verbose("%s: Core ID %u\n", cpuname, ci->ci_coreid);
+ aprint_verbose("%s: SMT ID %u\n", cpuname, ci->ci_smtid);
+}
- ci->ci_coreid =
- __SHIFTOUT(ci->ci_initapicid, core_mask);
- aprint_verbose("%s: Core ID %u\n", cpuname, ci->ci_coreid);
- }
- if (smt_bits) {
- u_int smt_mask = __BITS((int)0, (int)(smt_bits - 1));
+static void
+identifycpu_cpuids(struct cpu_info *ci)
+{
+ const char *cpuname = ci->ci_dev;
- ci->ci_smtid =
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Wed Nov 21 12:18:53 UTC 2018 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add Intel CPUID Extended Topology Enumeration Fn000b definitions. To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.133 src/sys/arch/x86/include/specialreg.h:1.134 --- src/sys/arch/x86/include/specialreg.h:1.133 Wed Nov 21 06:09:49 2018 +++ src/sys/arch/x86/include/specialreg.h Wed Nov 21 12:18:53 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.133 2018/11/21 06:09:49 msaitoh Exp $ */ +/* $NetBSD: specialreg.h,v 1.134 2018/11/21 12:18:53 msaitoh Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -415,6 +415,23 @@ "\35" "L1D_FLUSH" "\36" "ARCH_CAP" "\40" "SSBD" /* + * Intel CPUID Extended Topology Enumeration Fn000b + * %ecx == level number + * %eax: See below. + * %ebx: Number of logical processors at this level. + * %ecx: See below. + * %edx: x2APIC ID of the current logical processor. + */ +/* %eax */ +#define CPUID_TOP_SHIFTNUM __BITS(4, 0) /* Topology ID shift value */ +/* %ecx */ +#define CPUID_TOP_LVLNUM __BITS(7, 0) /* Level number */ +#define CPUID_TOP_LVLTYPE __BITS(15, 8) /* Level type */ +#define CPUID_TOP_LVLTYPE_INVAL 0 /* Invalid */ +#define CPUID_TOP_LVLTYPE_SMT 1 /* SMT */ +#define CPUID_TOP_LVLTYPE_CORE 2 /* Core */ + +/* * Intel/AMD CPUID Processor extended state Enumeration Fn000d * * %ecx == 0: supported features info:
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Wed Nov 21 12:15:40 UTC 2018 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Tickets #1652 and #1653 To generate a diff of this commit: cvs rdiff -u -r1.1.2.112 -r1.1.2.113 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.112 src/doc/CHANGES-7.0.3:1.1.2.113 --- src/doc/CHANGES-7.0.3:1.1.2.112 Tue Oct 30 19:39:06 2018 +++ src/doc/CHANGES-7.0.3 Wed Nov 21 12:15:40 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.112 2018/10/30 19:39:06 martin Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.113 2018/11/21 12:15:40 martin Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -5530,3 +5530,13 @@ doc/3RDPARTY (apply patch) Updated tzdata to 2018g. [kre, ticket #1644] +sys/compat/netbsd32/netbsd32_socket.c 1.48 (patch) + + Fix a buffer overflow. + [maxv, ticket #1652] + +sys/kern/kern_event.c1.104 + + Fix kernel info leak. + [maxv, ticket #1653] +
CVS commit: [netbsd-7-0] src/sys/kern
Module Name:src Committed By: martin Date: Wed Nov 21 12:14:30 UTC 2018 Modified Files: src/sys/kern [netbsd-7-0]: kern_event.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1653): sys/kern/kern_event.c: revision 1.104 Fix kernel info leak. There are 4 bytes of padding in struct kevent. [ 287.537676] kleak: Possible leak in copyout: [len=40, leaked=4] [ 287.537676] #0 0x80b7c41a in kleak_note [ 287.547673] #1 0x80b7c49a in kleak_copyout [ 287.557677] #2 0x80b1d32d in kqueue_scan.isra.1.constprop.2 [ 287.557677] #3 0x80b1dc6a in kevent1 [ 287.567683] #4 0x80b1dcb0 in sys___kevent50 [ 287.567683] #5 0x8025ab3c in sy_call [ 287.577688] #6 0x8025ad6e in sy_invoke [ 287.587693] #7 0x8025adf4 in syscall To generate a diff of this commit: cvs rdiff -u -r1.80.2.1.2.1 -r1.80.2.1.2.2 src/sys/kern/kern_event.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/kern/kern_event.c diff -u src/sys/kern/kern_event.c:1.80.2.1.2.1 src/sys/kern/kern_event.c:1.80.2.1.2.2 --- src/sys/kern/kern_event.c:1.80.2.1.2.1 Sat Jul 8 16:51:56 2017 +++ src/sys/kern/kern_event.c Wed Nov 21 12:14:29 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_event.c,v 1.80.2.1.2.1 2017/07/08 16:51:56 snj Exp $ */ +/* $NetBSD: kern_event.c,v 1.80.2.1.2.2 2018/11/21 12:14:29 martin Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.80.2.1.2.1 2017/07/08 16:51:56 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.80.2.1.2.2 2018/11/21 12:14:29 martin Exp $"); #include #include @@ -584,6 +584,7 @@ filt_proc(struct knote *kn, long hint) * event with the parent's pid. Register knote with new * process. */ + memset(, 0, sizeof(kev)); kev.ident = hint & NOTE_PDATAMASK; /* pid */ kev.filter = kn->kn_filter; kev.flags = kn->kn_flags | EV_ADD | EV_ENABLE | EV_FLAG1;
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Wed Nov 21 12:13:46 UTC 2018 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Tickets #1652 and #1653 To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1.3 diff -u src/doc/CHANGES-7.1.3:1.1.2.19 src/doc/CHANGES-7.1.3:1.1.2.20 --- src/doc/CHANGES-7.1.3:1.1.2.19 Tue Oct 30 19:32:07 2018 +++ src/doc/CHANGES-7.1.3 Wed Nov 21 12:13:46 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1.3,v 1.1.2.19 2018/10/30 19:32:07 martin Exp $ +# $NetBSD: CHANGES-7.1.3,v 1.1.2.20 2018/11/21 12:13:46 martin Exp $ A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3 release: @@ -222,3 +222,13 @@ doc/3RDPARTY (apply patch) Updated tzdata to 2018g. [kre, ticket #1644] +sys/compat/netbsd32/netbsd32_socket.c 1.48 (patch) + + Fix a buffer overflow. + [maxv, ticket #1652] + +sys/kern/kern_event.c1.104 + + Fix kernel info leak. + [maxv, ticket #1653] +
CVS commit: [netbsd-7-1] src/sys/kern
Module Name:src Committed By: martin Date: Wed Nov 21 12:13:08 UTC 2018 Modified Files: src/sys/kern [netbsd-7-1]: kern_event.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1653): sys/kern/kern_event.c: revision 1.104 Fix kernel info leak. There are 4 bytes of padding in struct kevent. [ 287.537676] kleak: Possible leak in copyout: [len=40, leaked=4] [ 287.537676] #0 0x80b7c41a in kleak_note [ 287.547673] #1 0x80b7c49a in kleak_copyout [ 287.557677] #2 0x80b1d32d in kqueue_scan.isra.1.constprop.2 [ 287.557677] #3 0x80b1dc6a in kevent1 [ 287.567683] #4 0x80b1dcb0 in sys___kevent50 [ 287.567683] #5 0x8025ab3c in sy_call [ 287.577688] #6 0x8025ad6e in sy_invoke [ 287.587693] #7 0x8025adf4 in syscall To generate a diff of this commit: cvs rdiff -u -r1.80.2.1.6.1 -r1.80.2.1.6.2 src/sys/kern/kern_event.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/kern/kern_event.c diff -u src/sys/kern/kern_event.c:1.80.2.1.6.1 src/sys/kern/kern_event.c:1.80.2.1.6.2 --- src/sys/kern/kern_event.c:1.80.2.1.6.1 Sat Jul 8 16:52:27 2017 +++ src/sys/kern/kern_event.c Wed Nov 21 12:13:08 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_event.c,v 1.80.2.1.6.1 2017/07/08 16:52:27 snj Exp $ */ +/* $NetBSD: kern_event.c,v 1.80.2.1.6.2 2018/11/21 12:13:08 martin Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.80.2.1.6.1 2017/07/08 16:52:27 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.80.2.1.6.2 2018/11/21 12:13:08 martin Exp $"); #include #include @@ -584,6 +584,7 @@ filt_proc(struct knote *kn, long hint) * event with the parent's pid. Register knote with new * process. */ + memset(, 0, sizeof(kev)); kev.ident = hint & NOTE_PDATAMASK; /* pid */ kev.filter = kn->kn_filter; kev.flags = kn->kn_flags | EV_ADD | EV_ENABLE | EV_FLAG1;
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Wed Nov 21 12:12:44 UTC 2018 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Tickets #1652 and #1653 To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.13 src/doc/CHANGES-7.3:1.1.2.14 --- src/doc/CHANGES-7.3:1.1.2.13 Sun Nov 18 19:43:03 2018 +++ src/doc/CHANGES-7.3 Wed Nov 21 12:12:44 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.13 2018/11/18 19:43:03 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.14 2018/11/21 12:12:44 martin Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -220,4 +220,13 @@ sys/arch/macppc/stand/ofwboot/version 1 PR port-macppc/53727. [tsutsui, ticket #1651] +sys/compat/netbsd32/netbsd32_socket.c 1.48 (patch) + + Fix a buffer overflow. + [maxv, ticket #1652] + +sys/kern/kern_event.c1.104 + + Fix kernel info leak. + [maxv, ticket #1653]
CVS commit: [netbsd-7] src/sys/kern
Module Name:src Committed By: martin Date: Wed Nov 21 12:12:15 UTC 2018 Modified Files: src/sys/kern [netbsd-7]: kern_event.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1653): sys/kern/kern_event.c: revision 1.104 Fix kernel info leak. There are 4 bytes of padding in struct kevent. [ 287.537676] kleak: Possible leak in copyout: [len=40, leaked=4] [ 287.537676] #0 0x80b7c41a in kleak_note [ 287.547673] #1 0x80b7c49a in kleak_copyout [ 287.557677] #2 0x80b1d32d in kqueue_scan.isra.1.constprop.2 [ 287.557677] #3 0x80b1dc6a in kevent1 [ 287.567683] #4 0x80b1dcb0 in sys___kevent50 [ 287.567683] #5 0x8025ab3c in sy_call [ 287.577688] #6 0x8025ad6e in sy_invoke [ 287.587693] #7 0x8025adf4 in syscall To generate a diff of this commit: cvs rdiff -u -r1.80.2.2 -r1.80.2.3 src/sys/kern/kern_event.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/kern/kern_event.c diff -u src/sys/kern/kern_event.c:1.80.2.2 src/sys/kern/kern_event.c:1.80.2.3 --- src/sys/kern/kern_event.c:1.80.2.2 Sat Jul 8 16:53:24 2017 +++ src/sys/kern/kern_event.c Wed Nov 21 12:12:15 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_event.c,v 1.80.2.2 2017/07/08 16:53:24 snj Exp $ */ +/* $NetBSD: kern_event.c,v 1.80.2.3 2018/11/21 12:12:15 martin Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.80.2.2 2017/07/08 16:53:24 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.80.2.3 2018/11/21 12:12:15 martin Exp $"); #include #include @@ -584,6 +584,7 @@ filt_proc(struct knote *kn, long hint) * event with the parent's pid. Register knote with new * process. */ + memset(, 0, sizeof(kev)); kev.ident = hint & NOTE_PDATAMASK; /* pid */ kev.filter = kn->kn_filter; kev.flags = kn->kn_flags | EV_ADD | EV_ENABLE | EV_FLAG1;
CVS commit: [netbsd-7-1] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Wed Nov 21 12:09:54 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [netbsd-7-1]: netbsd32_socket.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1652):
sys/compat/netbsd32/netbsd32_socket.c: revision 1.48 (via patch)
Fix inverted logic, which leads to buffer overflow. Detected by kASan.
To generate a diff of this commit:
cvs rdiff -u -r1.41.14.1 -r1.41.14.1.6.1 \
src/sys/compat/netbsd32/netbsd32_socket.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_socket.c
diff -u src/sys/compat/netbsd32/netbsd32_socket.c:1.41.14.1 src/sys/compat/netbsd32/netbsd32_socket.c:1.41.14.1.6.1
--- src/sys/compat/netbsd32/netbsd32_socket.c:1.41.14.1 Sat Aug 8 15:41:54 2015
+++ src/sys/compat/netbsd32/netbsd32_socket.c Wed Nov 21 12:09:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_socket.c,v 1.41.14.1 2015/08/08 15:41:54 martin Exp $ */
+/* $NetBSD: netbsd32_socket.c,v 1.41.14.1.6.1 2018/11/21 12:09:54 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.41.14.1 2015/08/08 15:41:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.41.14.1.6.1 2018/11/21 12:09:54 martin Exp $");
#include
#include
@@ -99,7 +99,7 @@ copyout32_msg_control_mbuf(struct lwp *l
}
ktrkuser("msgcontrol", cmsg, cmsg->cmsg_len);
- error = copyout(, *q, MAX(i, sizeof(cmsg32)));
+ error = copyout(, *q, MIN(i, sizeof(cmsg32)));
if (error)
return (error);
if (i > CMSG32_LEN(0)) {
CVS commit: [netbsd-7] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Wed Nov 21 12:09:03 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [netbsd-7]: netbsd32_socket.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1652):
sys/compat/netbsd32/netbsd32_socket.c: revision 1.48 (via patch)
Fix inverted logic, which leads to buffer overflow. Detected by kASan.
To generate a diff of this commit:
cvs rdiff -u -r1.41.14.1 -r1.41.14.2 \
src/sys/compat/netbsd32/netbsd32_socket.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_socket.c
diff -u src/sys/compat/netbsd32/netbsd32_socket.c:1.41.14.1 src/sys/compat/netbsd32/netbsd32_socket.c:1.41.14.2
--- src/sys/compat/netbsd32/netbsd32_socket.c:1.41.14.1 Sat Aug 8 15:41:54 2015
+++ src/sys/compat/netbsd32/netbsd32_socket.c Wed Nov 21 12:09:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_socket.c,v 1.41.14.1 2015/08/08 15:41:54 martin Exp $ */
+/* $NetBSD: netbsd32_socket.c,v 1.41.14.2 2018/11/21 12:09:03 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.41.14.1 2015/08/08 15:41:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.41.14.2 2018/11/21 12:09:03 martin Exp $");
#include
#include
@@ -99,7 +99,7 @@ copyout32_msg_control_mbuf(struct lwp *l
}
ktrkuser("msgcontrol", cmsg, cmsg->cmsg_len);
- error = copyout(, *q, MAX(i, sizeof(cmsg32)));
+ error = copyout(, *q, MIN(i, sizeof(cmsg32)));
if (error)
return (error);
if (i > CMSG32_LEN(0)) {
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Nov 21 12:06:14 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Tickets #1100, #1101 and #1102 To generate a diff of this commit: cvs rdiff -u -r1.1.2.59 -r1.1.2.60 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.59 src/doc/CHANGES-8.1:1.1.2.60 --- src/doc/CHANGES-8.1:1.1.2.59 Tue Nov 20 16:06:49 2018 +++ src/doc/CHANGES-8.1 Wed Nov 21 12:06:14 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.59 2018/11/20 16:06:49 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.60 2018/11/21 12:06:14 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -1733,3 +1733,18 @@ sys/dev/usb/usbdi.c1.179,1.180 Workaround NBP PN533 USB toggle bit bugs. [manu, ticket #1099] +sys/kern/kern_exec.c1.462 + + Fix stack info leak. + [maxv, ticket #1100] + +sys/net/rtsock.c1.244 + + Fix kernel info leak. + [maxv, ticket #1101] + +sys/kern/kern_event.c1.104 + + Fix kernel info leak. + [maxv, ticket #1102] +
CVS commit: [netbsd-8] src/sys/kern
Module Name:src Committed By: martin Date: Wed Nov 21 12:05:10 UTC 2018 Modified Files: src/sys/kern [netbsd-8]: kern_event.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1102): sys/kern/kern_event.c: revision 1.104 Fix kernel info leak. There are 4 bytes of padding in struct kevent. [ 287.537676] kleak: Possible leak in copyout: [len=40, leaked=4] [ 287.537676] #0 0x80b7c41a in kleak_note [ 287.547673] #1 0x80b7c49a in kleak_copyout [ 287.557677] #2 0x80b1d32d in kqueue_scan.isra.1.constprop.2 [ 287.557677] #3 0x80b1dc6a in kevent1 [ 287.567683] #4 0x80b1dcb0 in sys___kevent50 [ 287.567683] #5 0x8025ab3c in sy_call [ 287.577688] #6 0x8025ad6e in sy_invoke [ 287.587693] #7 0x8025adf4 in syscall To generate a diff of this commit: cvs rdiff -u -r1.91.2.2 -r1.91.2.3 src/sys/kern/kern_event.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/kern/kern_event.c diff -u src/sys/kern/kern_event.c:1.91.2.2 src/sys/kern/kern_event.c:1.91.2.3 --- src/sys/kern/kern_event.c:1.91.2.2 Tue Jan 16 13:26:12 2018 +++ src/sys/kern/kern_event.c Wed Nov 21 12:05:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_event.c,v 1.91.2.2 2018/01/16 13:26:12 martin Exp $ */ +/* $NetBSD: kern_event.c,v 1.91.2.3 2018/11/21 12:05:09 martin Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.91.2.2 2018/01/16 13:26:12 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.91.2.3 2018/11/21 12:05:09 martin Exp $"); #include #include @@ -584,6 +584,7 @@ filt_proc(struct knote *kn, long hint) * event with the parent's pid. Register knote with new * process. */ + memset(, 0, sizeof(kev)); kev.ident = hint & NOTE_PDATAMASK; /* pid */ kev.filter = kn->kn_filter; kev.flags = kn->kn_flags | EV_ADD | EV_ENABLE | EV_FLAG1;
CVS commit: [netbsd-8] src/sys/net
Module Name:src
Committed By: martin
Date: Wed Nov 21 12:01:11 UTC 2018
Modified Files:
src/sys/net [netbsd-8]: rtsock.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1101):
sys/net/rtsock.c: revision 1.244
Fix kernel info leak. There are 2 bytes of padding in struct if_msghdr.
[ 944.607323] kleak: Possible leak in copyout: [len=176, leaked=2]
[ 944.617335] #0 0x80b7c44a in kleak_note
[ 944.627332] #1 0x80b7c4ca in kleak_copyout
[ 944.627332] #2 0x80c91698 in sysctl_iflist_if
[ 944.637336] #3 0x80c91d3c in sysctl_iflist
[ 944.647343] #4 0x80c93855 in sysctl_rtable
[ 944.647343] #5 0x80b5b328 in sysctl_dispatch
[ 944.657346] #6 0x80b5b62e in sys___sysctl
[ 944.667354] #7 0x8025ab3c in sy_call
[ 944.667354] #8 0x8025ad6e in sy_invoke
[ 944.677365] #9 0x8025adf4 in syscall
To generate a diff of this commit:
cvs rdiff -u -r1.213.2.10 -r1.213.2.11 src/sys/net/rtsock.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/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.213.2.10 src/sys/net/rtsock.c:1.213.2.11
--- src/sys/net/rtsock.c:1.213.2.10 Sat May 5 19:07:51 2018
+++ src/sys/net/rtsock.c Wed Nov 21 12:01:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.213.2.10 2018/05/05 19:07:51 martin Exp $ */
+/* $NetBSD: rtsock.c,v 1.213.2.11 2018/11/21 12:01:11 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.213.2.10 2018/05/05 19:07:51 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.213.2.11 2018/11/21 12:01:11 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1294,7 +1294,7 @@ again:
if (rw->w_tmemsize < len) {
if (rw->w_tmem)
kmem_free(rw->w_tmem, rw->w_tmemsize);
-rw->w_tmem = kmem_alloc(len, KM_SLEEP);
+rw->w_tmem = kmem_zalloc(len, KM_SLEEP);
rw->w_tmemsize = len;
}
if (rw->w_tmem) {
@@ -1863,7 +1863,7 @@ sysctl_rtable(SYSCTLFN_ARGS)
again:
/* we may return here if a later [re]alloc of the t_mem buffer fails */
if (w.w_tmemneeded) {
- w.w_tmem = kmem_alloc(w.w_tmemneeded, KM_SLEEP);
+ w.w_tmem = kmem_zalloc(w.w_tmemneeded, KM_SLEEP);
w.w_tmemsize = w.w_tmemneeded;
w.w_tmemneeded = 0;
}
CVS commit: [netbsd-8] src/sys/kern
Module Name:src Committed By: martin Date: Wed Nov 21 11:58:32 UTC 2018 Modified Files: src/sys/kern [netbsd-8]: kern_exec.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1100): sys/kern/kern_exec.c: revision 1.462 Fix stack info leak. There are 2x4 bytes of padding in struct ps_strings. [ 223.896199] kleak: Possible leak in copyout: [len=32, leaked=8] [ 223.906430] #0 0x80224d0a in kleak_note [ 223.906430] #1 0x80224d8a in kleak_copyout [ 223.918363] #2 0x80b1e26c in copyoutpsstrs [ 223.926560] #3 0x80b1e331 in copyoutargs [ 223.936216] #4 0x80b21768 in execve_runproc [ 223.946225] #5 0x80b21cc9 in execve1 [ 223.946225] #6 0x8025a89c in sy_call [ 223.956225] #7 0x8025aace in sy_invoke [ 223.966232] #8 0x8025ab54 in syscall To generate a diff of this commit: cvs rdiff -u -r1.442.4.3 -r1.442.4.4 src/sys/kern/kern_exec.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/kern/kern_exec.c diff -u src/sys/kern/kern_exec.c:1.442.4.3 src/sys/kern/kern_exec.c:1.442.4.4 --- src/sys/kern/kern_exec.c:1.442.4.3 Sat Mar 17 11:19:27 2018 +++ src/sys/kern/kern_exec.c Wed Nov 21 11:58:32 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_exec.c,v 1.442.4.3 2018/03/17 11:19:27 martin Exp $ */ +/* $NetBSD: kern_exec.c,v 1.442.4.4 2018/11/21 11:58:32 martin Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.442.4.3 2018/03/17 11:19:27 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.442.4.4 2018/11/21 11:58:32 martin Exp $"); #include "opt_exec.h" #include "opt_execfmt.h" @@ -1447,6 +1447,8 @@ copyoutargs(struct execve_data * restric struct proc *p = l->l_proc; int error; + memset(>ed_arginfo, 0, sizeof(data->ed_arginfo)); + /* remember information about the process */ data->ed_arginfo.ps_nargvstr = data->ed_argc; data->ed_arginfo.ps_nenvstr = data->ed_envc;
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: jmcneill Date: Wed Nov 21 11:44:26 UTC 2018 Modified Files: src/sys/arch/arm/cortex: gicv3.c gicv3_its.c Log Message: kcpuset_ffs returns the cpu number plus one, so make sure to subtract it To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/cortex/gicv3.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/cortex/gicv3_its.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/arch/arm/cortex/gicv3.c diff -u src/sys/arch/arm/cortex/gicv3.c:1.11 src/sys/arch/arm/cortex/gicv3.c:1.12 --- src/sys/arch/arm/cortex/gicv3.c:1.11 Sat Nov 17 00:17:54 2018 +++ src/sys/arch/arm/cortex/gicv3.c Wed Nov 21 11:44:26 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: gicv3.c,v 1.11 2018/11/17 00:17:54 jmcneill Exp $ */ +/* $NetBSD: gicv3.c,v 1.12 2018/11/21 11:44:26 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -31,7 +31,7 @@ #define _INTR_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.11 2018/11/17 00:17:54 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.12 2018/11/21 11:44:26 jmcneill Exp $"); #include #include @@ -489,7 +489,7 @@ gicv3_set_affinity(struct pic_softc *pic if (set == ncpu) irouter = GICD_IROUTER_Interrupt_Routing_mode; else if (set == 1) - irouter = sc->sc_irouter[kcpuset_ffs(affinity)]; + irouter = sc->sc_irouter[kcpuset_ffs(affinity) - 1]; else return EINVAL; Index: src/sys/arch/arm/cortex/gicv3_its.c diff -u src/sys/arch/arm/cortex/gicv3_its.c:1.3 src/sys/arch/arm/cortex/gicv3_its.c:1.4 --- src/sys/arch/arm/cortex/gicv3_its.c:1.3 Fri Nov 16 15:06:21 2018 +++ src/sys/arch/arm/cortex/gicv3_its.c Wed Nov 21 11:44:26 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: gicv3_its.c,v 1.3 2018/11/16 15:06:21 jmcneill Exp $ */ +/* $NetBSD: gicv3_its.c,v 1.4 2018/11/21 11:44:26 jmcneill Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #define _INTR_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.3 2018/11/16 15:06:21 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.4 2018/11/21 11:44:26 jmcneill Exp $"); #include #include @@ -713,7 +713,7 @@ gicv3_its_set_affinity(void *priv, size_ if (pa == NULL) return EINVAL; - ci = cpu_lookup(kcpuset_ffs(affinity)); + ci = cpu_lookup(kcpuset_ffs(affinity) - 1); const uint32_t devid = gicv3_its_devid(pa->pa_pc, pa->pa_tag); gits_command_movi(its, devid, devid, cpu_index(ci));
CVS commit: src
Module Name:src
Committed By: msaitoh
Date: Wed Nov 21 10:34:53 UTC 2018
Modified Files:
src/sys/arch/x86/x86: cpu_topology.c
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
- AMD also reports CPUID 7's highest subleaf. Print it.
- Use macro.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/x86/cpu_topology.c
cvs rdiff -u -r1.86 -r1.87 src/usr.sbin/cpuctl/arch/i386.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/arch/x86/x86/cpu_topology.c
diff -u src/sys/arch/x86/x86/cpu_topology.c:1.13 src/sys/arch/x86/x86/cpu_topology.c:1.14
--- src/sys/arch/x86/x86/cpu_topology.c:1.13 Sun Jan 28 16:32:43 2018
+++ src/sys/arch/x86/x86/cpu_topology.c Wed Nov 21 10:34:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_topology.c,v 1.13 2018/01/28 16:32:43 mlelstv Exp $ */
+/* $NetBSD: cpu_topology.c,v 1.14 2018/11/21 10:34:53 msaitoh Exp $ */
/*-
* Copyright (c) 2009 Mindaugas Rasiukevicius ,
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.13 2018/01/28 16:32:43 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_topology.c,v 1.14 2018/11/21 10:34:53 msaitoh Exp $");
#include
#include
@@ -92,7 +92,8 @@ x86_cpu_topology(struct cpu_info *ci)
if (ci->ci_max_cpuid >= 4) {
/* Maximum number of Cores per package (eax[31:26]). */
x86_cpuid2(4, 0, descs);
- core_max = (descs[0] >> 26) + 1;
+ core_max = __SHIFTOUT(descs[0], CPUID_DCP_CORE_P_PKG)
+ + 1;
} else {
core_max = 1;
}
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.86 src/usr.sbin/cpuctl/arch/i386.c:1.87
--- src/usr.sbin/cpuctl/arch/i386.c:1.86 Wed Nov 21 06:10:25 2018
+++ src/usr.sbin/cpuctl/arch/i386.c Wed Nov 21 10:34:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.86 2018/11/21 06:10:25 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.87 2018/11/21 10:34:53 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.86 2018/11/21 06:10:25 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.87 2018/11/21 10:34:53 msaitoh Exp $");
#endif /* not lint */
#include
@@ -1813,7 +1813,7 @@ identifycpu_cpuids(struct cpu_info *ci)
}
if (ci->ci_cpuid_level >= 4) {
x86_cpuid2(4, 0, descs);
- core_max = (descs[0] >> 26) + 1;
+ core_max = __SHIFTOUT(descs[0], CPUID_DCP_CORE_P_PKG) + 1;
}
assert(lp_max >= core_max);
smt_max = lp_max / core_max;
@@ -2098,6 +2098,14 @@ identifycpu(int fd, const char *cpuname)
print_bits(cpuname, "DSPM-eax", CPUID_DSPM_FLAGS, descs[0]);
print_bits(cpuname, "DSPM-ecx", CPUID_DSPM_FLAGS1, descs[2]);
}
+ if ((ci->ci_cpuid_level >= 7)
+ && ((cpu_vendor == CPUVENDOR_INTEL)
+ || (cpu_vendor == CPUVENDOR_AMD))) {
+ x86_cpuid(7, descs);
+ aprint_verbose("%s: SEF highest subleaf %08x\n",
+ cpuname, descs[0]);
+ }
+
if (cpu_vendor == CPUVENDOR_AMD) {
x86_cpuid(0x8000, descs);
if (descs[0] >= 0x8007)
@@ -2117,13 +2125,11 @@ identifycpu(int fd, const char *cpuname)
int32_t bi_index;
for (bi_index = 1; bi_index <= ci->ci_cpuid_level; bi_index++) {
+#if 0
x86_cpuid(bi_index, descs);
switch (bi_index) {
- case 7:
-aprint_verbose("%s: SEF highest subleaf %08x\n",
-cpuname, descs[0]);
+ case 0x0b:
break;
-#if 0
default:
aprint_verbose("%s: basic %08x-eax %08x\n",
cpuname, bi_index, descs[0]);
@@ -2134,8 +2140,8 @@ identifycpu(int fd, const char *cpuname)
aprint_verbose("%s: basic %08x-edx %08x\n",
cpuname, bi_index, descs[3]);
break;
-#endif
}
+#endif
}
}
CVS commit: src/libexec/httpd
Module Name:src
Committed By: mrg
Date: Wed Nov 21 10:25:17 UTC 2018
Modified Files:
src/libexec/httpd: dir-index-bozo.c
Log Message:
two fixes reported by mouse:
- don't check contents of 'st' if stat(2) failed.
- round up instead of truncate. now 1 byte files say 10kB not 9kB.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/libexec/httpd/dir-index-bozo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/dir-index-bozo.c
diff -u src/libexec/httpd/dir-index-bozo.c:1.26 src/libexec/httpd/dir-index-bozo.c:1.27
--- src/libexec/httpd/dir-index-bozo.c:1.26 Tue Nov 20 01:06:46 2018
+++ src/libexec/httpd/dir-index-bozo.c Wed Nov 21 10:25:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dir-index-bozo.c,v 1.26 2018/11/20 01:06:46 mrg Exp $ */
+/* $NetBSD: dir-index-bozo.c,v 1.27 2018/11/21 10:25:17 mrg Exp $ */
/* $eterna: dir-index-bozo.c,v 1.20 2011/11/18 09:21:15 mrg Exp $ */
@@ -157,7 +157,7 @@ bozo_dir_index(bozo_httpreq_t *request,
if (strcmp(name, "..") == 0) {
bozo_printf(httpd, "");
l += bozo_printf(httpd, "Parent Directory");
- } else if (S_ISDIR(sb.st_mode)) {
+ } else if (!nostat && S_ISDIR(sb.st_mode)) {
bozo_printf(httpd, "", urlname);
l += bozo_printf(httpd, "%s/", htmlname);
} else if (strchr(name, ':') != NULL) {
@@ -185,6 +185,10 @@ bozo_dir_index(bozo_httpreq_t *request,
if (nostat)
bozo_printf(httpd, "? ?");
else {
+ unsigned long long len;
+
+ len = ((unsigned long long)sb.st_size + 1023) / 1024;
+
tm = gmtime(_mtime);
strftime(buf, sizeof buf, "%d-%b-%Y %R", tm);
l += bozo_printf(httpd, "%s", buf);
@@ -199,8 +203,7 @@ bozo_dir_index(bozo_httpreq_t *request,
spacebuf[i] = '\0';
bozo_printf(httpd, "%s", spacebuf);
- bozo_printf(httpd, "%12llukB",
-(unsigned long long)sb.st_size >> 10);
+ bozo_printf(httpd, "%12llukB", len);
}
bozo_printf(httpd, "\r\n");
}
CVS commit: src/sys/arch/arm/xscale
Module Name:src Committed By: thorpej Date: Wed Nov 21 09:49:39 UTC 2018 Modified Files: src/sys/arch/arm/xscale: i80321_space.c Log Message: EINVAL (22) is a valid return value for ARM mmap routines; we need to return -1 for invalid mmap attempts. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/xscale/i80321_space.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/arch/arm/xscale/i80321_space.c diff -u src/sys/arch/arm/xscale/i80321_space.c:1.16 src/sys/arch/arm/xscale/i80321_space.c:1.17 --- src/sys/arch/arm/xscale/i80321_space.c:1.16 Sun Nov 18 06:28:39 2018 +++ src/sys/arch/arm/xscale/i80321_space.c Wed Nov 21 09:49:39 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_space.c,v 1.16 2018/11/18 06:28:39 macallan Exp $ */ +/* $NetBSD: i80321_space.c,v 1.17 2018/11/21 09:49:39 thorpej Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: i80321_space.c,v 1.16 2018/11/18 06:28:39 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i80321_space.c,v 1.17 2018/11/21 09:49:39 thorpej Exp $"); #include #include @@ -304,10 +304,10 @@ i80321_io_bs_mmap(void *t, bus_addr_t ad busbase = sc->sc_ioout_xlate; winpaddr = VERDE_OUT_XLATE_IO_WIN0_BASE; } else - return (EINVAL); + return (-1); if ((bpa) >= (busbase + VERDE_OUT_XLATE_IO_WIN_SIZE)) - return (EINVAL); + return (-1); return (arm_btop(winpaddr + (bpa - busbase))); } @@ -459,10 +459,10 @@ i80321_mem_bs_mmap(void *t, bus_addr_t a busbase = VERDE_OUT_DIRECT_WIN_BASE; physbase = VERDE_OUT_DIRECT_WIN_BASE; } else - return (EINVAL); + return (-1); if (bpa >= (VERDE_OUT_DIRECT_WIN_BASE + VERDE_OUT_DIRECT_WIN_SIZE)) - return (EINVAL); + return (-1); #else if (bpa >= sc->sc_owin[0].owin_xlate_lo && bpa < (sc->sc_owin[0].owin_xlate_lo + @@ -470,9 +470,9 @@ i80321_mem_bs_mmap(void *t, bus_addr_t a busbase = sc->sc_owin[0].owin_xlate_lo; physbase = sc->sc_iwin[1].iwin_xlate; } else - return (EINVAL); + return (-1); if (bpa >= (busbase + VERDE_OUT_XLATE_MEM_WIN_SIZE)) - return (EINVAL); + return (-1); #endif pa = trunc_page((bpa - busbase) + physbase);
CVS commit: src/libexec/httpd
Module Name:src
Committed By: mrg
Date: Wed Nov 21 09:37:02 UTC 2018
Modified Files:
src/libexec/httpd: CHANGES auth-bozo.c bozohttpd.c bozohttpd.h
src/libexec/httpd/testsuite: Makefile html_cmp test-bigfile test-simple
Log Message:
- move special files defines into bozohttpd.h, so we can ...
- consolidate all the special file checks into
bozo_check_special_files() so that all builds check the same
list of special files, regardless of build options.
- convert "(void)bozo_http_error(...); return -1;" into plain
"return bozo_http_error(...);"
- fix the call to bozo_check_special_files() to be used on all
input types. part of the fixes for failure to reject access
to /.htpasswd as reported by JP on tech-security.
- use warn_unused_result attribute on bozo_check_special_files(),
and fix the failures to return failure. second part of the
htpasswd access fix.
- update testsuite to use a fixed fake hostname.
call this bozohttpd 20181121.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.20 -r1.21 src/libexec/httpd/auth-bozo.c
cvs rdiff -u -r1.90 -r1.91 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.54 -r1.55 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.10 -r1.11 src/libexec/httpd/testsuite/Makefile
cvs rdiff -u -r1.5 -r1.6 src/libexec/httpd/testsuite/html_cmp
cvs rdiff -u -r1.4 -r1.5 src/libexec/httpd/testsuite/test-bigfile \
src/libexec/httpd/testsuite/test-simple
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.27 src/libexec/httpd/CHANGES:1.28
--- src/libexec/httpd/CHANGES:1.27 Tue Nov 20 01:06:46 2018
+++ src/libexec/httpd/CHANGES Wed Nov 21 09:37:02 2018
@@ -1,6 +1,6 @@
-$NetBSD: CHANGES,v 1.27 2018/11/20 01:06:46 mrg Exp $
+$NetBSD: CHANGES,v 1.28 2018/11/21 09:37:02 mrg Exp $
-changes in bozohttpd 20181118:
+changes in bozohttpd 20181121:
o add url remap support via .bzremap file, from mar...@netbsd.org
o handle redirections for any protocol, not just http:
o fix a denial of service attack against header contents, which
@@ -9,6 +9,7 @@ changes in bozohttpd 20181118:
initial line, each header, and the total time spent
o add -T option to expose new timeout settings
o minor RFC fixes related to timeout handling
+ o fix special file (.htpasswd, .bz*) bypass. reported by JP.
changes in bozohttpd 20170201:
o fix an infinite loop in cgi processing
Index: src/libexec/httpd/auth-bozo.c
diff -u src/libexec/httpd/auth-bozo.c:1.20 src/libexec/httpd/auth-bozo.c:1.21
--- src/libexec/httpd/auth-bozo.c:1.20 Tue Nov 20 01:06:46 2018
+++ src/libexec/httpd/auth-bozo.c Wed Nov 21 09:37:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-bozo.c,v 1.20 2018/11/20 01:06:46 mrg Exp $ */
+/* $NetBSD: auth-bozo.c,v 1.21 2018/11/21 09:37:02 mrg Exp $ */
/* $eterna: auth-bozo.c,v 1.17 2011/11/18 09:21:15 mrg Exp $ */
@@ -42,10 +42,6 @@
#include "bozohttpd.h"
-#ifndef AUTH_FILE
-#define AUTH_FILE ".htpasswd"
-#endif
-
static ssize_t base64_decode(const unsigned char *, size_t,
unsigned char *, size_t);
@@ -68,7 +64,6 @@ bozo_auth_check(bozo_httpreq_t *request,
strcpy(dir, ".");
else {
*basename++ = '\0';
- /* ensure basename(file) != AUTH_FILE */
if (bozo_check_special_files(request, basename))
return 1;
}
@@ -173,18 +168,6 @@ bozo_auth_check_headers(bozo_httpreq_t *
return 0;
}
-int
-bozo_auth_check_special_files(bozo_httpreq_t *request,
-const char *name)
-{
- bozohttpd_t *httpd = request->hr_httpd;
-
- if (strcmp(name, AUTH_FILE) == 0)
- return bozo_http_error(httpd, 403, request,
-"no permission to open authfile");
- return 0;
-}
-
void
bozo_auth_check_401(bozo_httpreq_t *request, int code)
{
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.90 src/libexec/httpd/bozohttpd.c:1.91
--- src/libexec/httpd/bozohttpd.c:1.90 Tue Nov 20 01:06:46 2018
+++ src/libexec/httpd/bozohttpd.c Wed Nov 21 09:37:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.90 2018/11/20 01:06:46 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.91 2018/11/21 09:37:02 mrg Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -109,26 +109,9 @@
#define INDEX_HTML "index.html"
#endif
#ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE "bozohttpd/20181119"
-#endif
-#ifndef DIRECT_ACCESS_FILE
-#define DIRECT_ACCESS_FILE ".bzdirect"
-#endif
-#ifndef REDIRECT_FILE
-#define REDIRECT_FILE ".bzredirect"
-#endif
-#ifndef ABSREDIRECT_FILE
-#define ABSREDIRECT_FILE ".bzabsredirect"
-#endif
-#ifndef REMAP_FILE
-#define REMAP_FILE ".bzremap"
+#define SERVER_SOFTWARE "bozohttpd/20181121"
#endif
-/*
- * When you add some .bz* file, make sure to als
CVS commit: src/sys/arch
Module Name:src
Committed By: skrll
Date: Wed Nov 21 08:55:05 UTC 2018
Modified Files:
src/sys/arch/arm/ti: files.ti
src/sys/arch/evbarm/conf: files.ti mk.ti std.ti
Removed Files:
src/sys/arch/evbarm/ti: ti_start.S
Log Message:
Make TI compile and convert TI to generic start
Compile tested only (obviously)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/files.ti
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/files.ti
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.ti
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/std.ti
cvs rdiff -u -r1.3 -r0 src/sys/arch/evbarm/ti/ti_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/ti/files.ti
diff -u src/sys/arch/arm/ti/files.ti:1.3 src/sys/arch/arm/ti/files.ti:1.4
--- src/sys/arch/arm/ti/files.ti:1.3 Sat Mar 17 18:34:09 2018
+++ src/sys/arch/arm/ti/files.ti Wed Nov 21 08:55:05 2018
@@ -1,9 +1,6 @@
-# $NetBSD: files.ti,v 1.3 2018/03/17 18:34:09 ryo Exp $
+# $NetBSD: files.ti,v 1.4 2018/11/21 08:55:05 skrll Exp $
#
-include arch/arm/pic/files.pic
-include arch/arm/cortex/files.cortex
-
file arch/arm/arm32/arm32_boot.c
file arch/arm/arm32/arm32_kvminit.c
file arch/arm/arm32/arm32_reboot.c
Index: src/sys/arch/evbarm/conf/files.ti
diff -u src/sys/arch/evbarm/conf/files.ti:1.1 src/sys/arch/evbarm/conf/files.ti:1.2
--- src/sys/arch/evbarm/conf/files.ti:1.1 Thu Oct 26 01:16:32 2017
+++ src/sys/arch/evbarm/conf/files.ti Wed Nov 21 08:55:05 2018
@@ -1,6 +1,9 @@
-# $NetBSD: files.ti,v 1.1 2017/10/26 01:16:32 jakllsch Exp $
+# $NetBSD: files.ti,v 1.2 2018/11/21 08:55:05 skrll Exp $
#
+include "arch/arm/pic/files.pic"
+include "arch/arm/cortex/files.cortex"
+
include "arch/evbarm/conf/files.fdt"
include "arch/arm/ti/files.ti"
Index: src/sys/arch/evbarm/conf/mk.ti
diff -u src/sys/arch/evbarm/conf/mk.ti:1.3 src/sys/arch/evbarm/conf/mk.ti:1.4
--- src/sys/arch/evbarm/conf/mk.ti:1.3 Wed Dec 13 13:52:13 2017
+++ src/sys/arch/evbarm/conf/mk.ti Wed Nov 21 08:55:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mk.ti,v 1.3 2017/12/13 13:52:13 jmcneill Exp $
+# $NetBSD: mk.ti,v 1.4 2018/11/21 08:55:05 skrll Exp $
.if !empty(MACHINE_ARCH:M*eb)
EXTRA_LINKFLAGS+= --be8
@@ -7,10 +7,8 @@ EXTRA_LINKFLAGS+= --be8
CPPFLAGS+= -mcpu=cortex-a8
CPPFLAGS+= -mfpu=neon
-SYSTEM_FIRST_OBJ= ti_start.o
-SYSTEM_FIRST_SFILE= ${THISARM}/ti/ti_start.S
-
-GENASSYM_EXTRAS+= ${THISARM}/beagle/genassym.cf
+SYSTEM_FIRST_OBJ= armv6_start.o
+SYSTEM_FIRST_SFILE= ${ARM}/arm/armv6_start.S
_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
Index: src/sys/arch/evbarm/conf/std.ti
diff -u src/sys/arch/evbarm/conf/std.ti:1.4 src/sys/arch/evbarm/conf/std.ti:1.5
--- src/sys/arch/evbarm/conf/std.ti:1.4 Wed Nov 21 08:49:58 2018
+++ src/sys/arch/evbarm/conf/std.ti Wed Nov 21 08:55:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.ti,v 1.4 2018/11/21 08:49:58 skrll Exp $
+# $NetBSD: std.ti,v 1.5 2018/11/21 08:55:05 skrll Exp $
#
machine evbarm arm
@@ -18,6 +18,7 @@ options __HAVE_CPU_COUNTER
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options __HAVE_FAST_SOFTINTS
options __HAVE_GENERIC_CPU_INITCLOCKS
+options __HAVE_GENERIC_START
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options LOADADDRESS="0x80008000"
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: skrll
Date: Wed Nov 21 08:49:58 UTC 2018
Modified Files:
src/sys/arch/evbarm/conf: std.ti
Log Message:
Sort
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/std.ti
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/std.ti
diff -u src/sys/arch/evbarm/conf/std.ti:1.3 src/sys/arch/evbarm/conf/std.ti:1.4
--- src/sys/arch/evbarm/conf/std.ti:1.3 Mon Oct 15 16:54:54 2018
+++ src/sys/arch/evbarm/conf/std.ti Wed Nov 21 08:49:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.ti,v 1.3 2018/10/15 16:54:54 skrll Exp $
+# $NetBSD: std.ti,v 1.4 2018/11/21 08:49:58 skrll Exp $
#
machine evbarm arm
@@ -6,25 +6,24 @@ include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.ti"
-
-options FDT
-options DRAM_BLOCKS=256
-options __HAVE_CPU_COUNTER
-options __HAVE_FAST_SOFTINTS
-options __HAVE_CPU_UAREA_ALLOC_IDLELWP
+options ARM_GENERIC_TODR
options ARM_HAS_VBAR
-options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-options TPIDRPRW_IS_CURCPU
+options ARM_INTR_IMPL=""
+options DRAM_BLOCKS=256
+options FDT
options FPU_VFP
+options TPIDRPRW_IS_CURCPU
options __BUS_SPACE_HAS_STREAM_METHODS
+options __HAVE_CPU_COUNTER
+options __HAVE_CPU_UAREA_ALLOC_IDLELWP
+options __HAVE_FAST_SOFTINTS
options __HAVE_GENERIC_CPU_INITCLOCKS
+options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options LOADADDRESS="0x80008000"
-makeoptions KERNEL_BASE_PHYS="0x80008000"
-makeoptions KERNEL_BASE_VIRT="0x80008000"
makeoptions BOARDTYPE="TI"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.ti"
makeoptions CPUFLAGS="-march=armv7-a -mfpu=neon"
+makeoptions KERNEL_BASE_PHYS="0x80008000"
+makeoptions KERNEL_BASE_VIRT="0x80008000"
-options ARM_INTR_IMPL=""
-options ARM_GENERIC_TODR
CVS commit: src/sys/arch/arm/samsung
Module Name:src Committed By: skrll Date: Wed Nov 21 08:48:23 UTC 2018 Modified Files: src/sys/arch/arm/samsung: files.exynos Log Message: G/C To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/samsung/files.exynos Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/samsung/files.exynos diff -u src/sys/arch/arm/samsung/files.exynos:1.34 src/sys/arch/arm/samsung/files.exynos:1.35 --- src/sys/arch/arm/samsung/files.exynos:1.34 Thu Oct 18 09:01:53 2018 +++ src/sys/arch/arm/samsung/files.exynos Wed Nov 21 08:48:23 2018 @@ -1,11 +1,8 @@ -# $NetBSD: files.exynos,v 1.34 2018/10/18 09:01:53 skrll Exp $ +# $NetBSD: files.exynos,v 1.35 2018/11/21 08:48:23 skrll Exp $ # # Configuration info for Samsung Exynos SoC ARM Peripherals # -#include "arch/arm/pic/files.pic" -#include "arch/arm/cortex/files.cortex" - defflag opt_cpuoptions.h ARM_TRUSTZONE_FIRMWARE file arch/arm/samsung/exynos_soc.c
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Wed Nov 21 08:37:06 UTC 2018 Modified Files: src/sys/arch/evbarm/conf: TI Log Message: options To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/TI Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/TI diff -u src/sys/arch/evbarm/conf/TI:1.5 src/sys/arch/evbarm/conf/TI:1.6 --- src/sys/arch/evbarm/conf/TI:1.5 Sat Jun 30 16:48:49 2018 +++ src/sys/arch/evbarm/conf/TI Wed Nov 21 08:37:06 2018 @@ -1,4 +1,4 @@ -# $NetBSD: TI,v 1.5 2018/06/30 16:48:49 jmcneill Exp $ +# $NetBSD: TI,v 1.6 2018/11/21 08:37:06 skrll Exp $ # include "arch/evbarm/conf/std.ti" @@ -18,11 +18,11 @@ makeoptions DTS=" makeoptions DEBUG="-g" # compile full symbol table makeoptions COPY_SYMTAB=1 -#options DIAGNOSTIC -#options DEBUG +#options DIAGNOSTIC +#options DEBUG options LOCKDEBUG -options CPU_CORTEXA8 +options CPU_CORTEXA8 options OMAP_SYSTEM_CLOCK_FREQ="4800UL"
