CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src Committed By: christos Date: Sat Feb 7 20:33:22 UTC 2015 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: dt_as.c Log Message: delete error(1) strings. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_as.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/cddl/osnet/dist/lib/libdtrace/common/dt_as.c diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_as.c:1.2 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_as.c:1.3 --- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_as.c:1.2 Sat Feb 7 15:30:03 2015 +++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_as.c Sat Feb 7 15:33:22 2015 @@ -428,12 +428,9 @@ dt_as(dt_pcb_t *pcb) if ((idp = dip->di_extern) == NULL) continue; /* no relocation entry needed */ -/*###429 [cc] error: 'kbits' may be used uninitialized in this function [-Werror=maybe-uninitialized]%%%*/ if ((idp->di_flags & kmask) == kbits) { nodef = knodef; rp = krp++; -/*###432 [cc] error: 'ubits' may be used uninitialized in this function [-Werror=maybe-uninitialized]%%%*/ -/*###432 [cc] error: 'umask' may be used uninitialized in this function [-Werror=maybe-uninitialized]%%%*/ } else if ((idp->di_flags & umask) == ubits) { nodef = unodef; rp = urp++;
CVS commit: src/external/cddl/osnet
Module Name:src Committed By: christos Date: Sat Feb 7 20:30:04 UTC 2015 Modified Files: src/external/cddl/osnet: Makefile.inc src/external/cddl/osnet/dist/cmd/dtrace: dtrace.c src/external/cddl/osnet/dist/common/ctf: ctf_create.c ctf_hash.c ctf_labels.c ctf_lookup.c ctf_open.c ctf_types.c src/external/cddl/osnet/dist/lib/libctf/common: ctf_lib.c src/external/cddl/osnet/dist/lib/libdtrace/common: dt_aggregate.c dt_as.c dt_cc.c dt_cg.c dt_consume.c dt_dis.c dt_dof.c dt_ident.c dt_lex.l dt_link.c dt_list.h dt_module.c dt_open.c dt_options.c dt_parser.c dt_pid.c dt_pragma.c dt_printf.c dt_proc.c dt_program.c dt_subr.c dt_work.c src/external/cddl/osnet/dist/lib/libgen/common: gmatch.c src/external/cddl/osnet/dist/tools/ctf/cvt: ctf.c ctfmerge.c ctftools.h dwarf.c st_parse.c stabs.c util.c src/external/cddl/osnet/lib/libdtrace: Makefile src/external/cddl/osnet/sys/sys: sysmacros.h Log Message: check and fix printf formats, negative array indices, uninitialized variables, shadowed variables. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dist/common/ctf/ctf_create.c \ src/external/cddl/osnet/dist/common/ctf/ctf_open.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/cddl/osnet/dist/common/ctf/ctf_hash.c \ src/external/cddl/osnet/dist/common/ctf/ctf_labels.c \ src/external/cddl/osnet/dist/common/ctf/ctf_lookup.c \ src/external/cddl/osnet/dist/common/ctf/ctf_types.c cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/lib/libctf/common/ctf_lib.c cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_aggregate.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_program.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_as.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_list.h cvs rdiff -u -r1.2 -r1.3 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_cc.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_cg.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_dis.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_dof.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_ident.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_lex.l \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pragma.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_work.c cvs rdiff -u -r1.5 -r1.6 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_options.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pid.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c cvs rdiff -u -r1.6 -r1.7 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c cvs rdiff -u -r1.7 -r1.8 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c cvs rdiff -u -r1.8 -r1.9 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/lib/libgen/common/gmatch.c cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c cvs rdiff -u -r1.9 -r1.10 \ src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h cvs rdiff -u -r1.11 -r1.12 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c \ src/external/cddl/osnet/dist/tools/ctf/cvt/stabs.c \ src/external/cddl/osnet/dist/tools/ctf/cvt/util.c cvs rdiff -u -r1.9 -r1.10 src/external/cddl/osnet/lib/libdtrace/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/sysmacros.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/Makefile.inc diff -u src/external/cddl/osnet/Makefile.inc:1.1 src/external/cddl/osnet/Makefile.inc:1.2 --- src/external/cddl/osnet/Makefile.inc:1.1 Sat Feb 20 20:46:32 2010 +++ src/external/cddl/osnet/Makefile.inc Sat Feb 7 15:30:03 2015 @@ -1,6 +1,8 @@ # $FreeBSD: src/cddl/Makefile.inc,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $ +WARNS?=5 OSNETDIR= ${NETBSDSRCDIR}/external/cddl/osnet OPENSOLARIS_USR_DISTDIR=${OSNETDIR}/dist OPENSOLARIS_SYS_DISTDIR=${OSNETDIR}/dist +CPPFLAGS+=-Wno-unknown-pragmas -Wno-sign-compare Index: src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c diff -u sr
CVS commit: src/sys/arch/xen/x86
Module Name:src Committed By: joerg Date: Sat Feb 7 20:01:48 UTC 2015 Modified Files: src/sys/arch/xen/x86: xen_ipi.c Log Message: valid_ipimask is only used under DIAGNOSTIC, so only define it then. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/xen/x86/xen_ipi.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/xen/x86/xen_ipi.c diff -u src/sys/arch/xen/x86/xen_ipi.c:1.18 src/sys/arch/xen/x86/xen_ipi.c:1.19 --- src/sys/arch/xen/x86/xen_ipi.c:1.18 Mon May 19 22:47:54 2014 +++ src/sys/arch/xen/x86/xen_ipi.c Sat Feb 7 20:01:48 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: xen_ipi.c,v 1.18 2014/05/19 22:47:54 rmind Exp $ */ +/* $NetBSD: xen_ipi.c,v 1.19 2015/02/07 20:01:48 joerg Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -33,10 +33,10 @@ /* * Based on: x86/ipi.c - * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.18 2014/05/19 22:47:54 rmind Exp $"); + * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.19 2015/02/07 20:01:48 joerg Exp $"); */ -__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.18 2014/05/19 22:47:54 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.19 2015/02/07 20:01:48 joerg Exp $"); #include @@ -131,6 +131,7 @@ xen_ipi_init(void) hypervisor_enable_event(evtchn); } +#ifdef DIAGNOSTIC static inline bool /* helper */ valid_ipimask(uint32_t ipimask) { @@ -145,6 +146,7 @@ valid_ipimask(uint32_t ipimask) } } +#endif int xen_send_ipi(struct cpu_info *ci, uint32_t ipimask)
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Sat Feb 7 19:36:42 UTC 2015 Modified Files: src/sys/sys: callout.h Log Message: Add an FMT macro to snprintb the callout flags. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/sys/callout.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/sys/callout.h diff -u src/sys/sys/callout.h:1.31 src/sys/sys/callout.h:1.32 --- src/sys/sys/callout.h:1.31 Mon Apr 28 16:24:10 2008 +++ src/sys/sys/callout.h Sat Feb 7 14:36:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: callout.h,v 1.31 2008/04/28 20:24:10 martin Exp $ */ +/* $NetBSD: callout.h,v 1.32 2015/02/07 19:36:42 christos Exp $ */ /*- * Copyright (c) 2000, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -59,6 +59,13 @@ typedef struct callout { #define CALLOUT_MPSAFE 0x0100 /* does not need kernel_lock */ #define CALLOUT_FLAGMASK 0xff00 +#define CALLOUT_FMT "\177\020\ +b\00BOUND\0\ +b\01PENDING\0\ +b\02FIRED\0\ +b\03INVOKING\0\ +b\10MPSAFE\0" + #ifdef _CALLOUT_PRIVATE /* The following funkyness is to appease gcc3's strict aliasing. */
CVS commit: src/usr.bin/netstat
Module Name:src Committed By: christos Date: Sat Feb 7 19:36:06 UTC 2015 Modified Files: src/usr.bin/netstat: Makefile inet.c inet6.c Log Message: print the timer flags. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/usr.bin/netstat/Makefile cvs rdiff -u -r1.104 -r1.105 src/usr.bin/netstat/inet.c cvs rdiff -u -r1.66 -r1.67 src/usr.bin/netstat/inet6.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.bin/netstat/Makefile diff -u src/usr.bin/netstat/Makefile:1.40 src/usr.bin/netstat/Makefile:1.41 --- src/usr.bin/netstat/Makefile:1.40 Thu Nov 6 16:30:09 2014 +++ src/usr.bin/netstat/Makefile Sat Feb 7 14:36:06 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2014/11/06 21:30:09 christos Exp $ +# $NetBSD: Makefile,v 1.41 2015/02/07 19:36:06 christos Exp $ # from: @(#)Makefile 8.1 (Berkeley) 6/12/93 .include @@ -11,8 +11,8 @@ SRCS= atalk.c bpf.c fast_ipsec.c if.c in unix.c vtw.c rtutil.c BINGRP= kmem BINMODE=2555 -LDADD= -lkvm -DPADD= ${LIBKVM} +LDADD= -lutil -lkvm +DPADD= ${LIBUTIL} ${LIBKVM} CPPFLAGS+= -DIPSEC -I${.CURDIR} CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dist/pf CPPFLAGS+= -I${NETBSDSRCDIR}/sbin/route Index: src/usr.bin/netstat/inet.c diff -u src/usr.bin/netstat/inet.c:1.104 src/usr.bin/netstat/inet.c:1.105 --- src/usr.bin/netstat/inet.c:1.104 Sat Nov 23 17:01:12 2013 +++ src/usr.bin/netstat/inet.c Sat Feb 7 14:36:06 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: inet.c,v 1.104 2013/11/23 22:01:12 christos Exp $ */ +/* $NetBSD: inet.c,v 1.105 2015/02/07 19:36:06 christos Exp $ */ /* * Copyright (c) 1983, 1988, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94"; #else -__RCSID("$NetBSD: inet.c,v 1.104 2013/11/23 22:01:12 christos Exp $"); +__RCSID("$NetBSD: inet.c,v 1.105 2015/02/07 19:36:06 christos Exp $"); #endif #endif /* not lint */ @@ -87,6 +87,7 @@ __RCSID("$NetBSD: inet.c,v 1.104 2013/11 #include #include #include +#include #include "netstat.h" #include "vtw.h" #include "prog_ops.h" @@ -982,10 +983,14 @@ tcp_dump(u_long off, const char *name, u printf("Timers:\n"); for (i = 0; i < TCPT_NTIMERS; i++) { + char buf[128]; ci = (callout_impl_t *)&tcpcb.t_timer[i]; - printf("\t%s: %d", tcptimers[i], - (ci->c_flags & CALLOUT_PENDING) ? - ci->c_time - hardticks : 0); + snprintb(buf, sizeof(buf), CALLOUT_FMT, ci->c_flags); + printf("\t%s\t%s", tcptimers[i], buf); + if (ci->c_flags & CALLOUT_PENDING) + printf("\t%d\n", ci->c_time - hardticks); + else + printf("\n"); } printf("\n\n"); Index: src/usr.bin/netstat/inet6.c diff -u src/usr.bin/netstat/inet6.c:1.66 src/usr.bin/netstat/inet6.c:1.67 --- src/usr.bin/netstat/inet6.c:1.66 Sat Nov 23 17:01:12 2013 +++ src/usr.bin/netstat/inet6.c Sat Feb 7 14:36:06 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: inet6.c,v 1.66 2013/11/23 22:01:12 christos Exp $ */ +/* $NetBSD: inet6.c,v 1.67 2015/02/07 19:36:06 christos Exp $ */ /* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */ /* @@ -64,7 +64,7 @@ #if 0 static char sccsid[] = "@(#)inet.c 8.4 (Berkeley) 4/20/94"; #else -__RCSID("$NetBSD: inet6.c,v 1.66 2013/11/23 22:01:12 christos Exp $"); +__RCSID("$NetBSD: inet6.c,v 1.67 2015/02/07 19:36:06 christos Exp $"); #endif #endif /* not lint */ @@ -135,6 +135,7 @@ extern const char * const tcptimers[]; #include #include #include +#include #include "netstat.h" #include "vtw.h" #include "prog_ops.h" @@ -1468,10 +1469,14 @@ tcp6_dump(u_long off, const char *name, printf("TCP Protocol Control Block at 0x%08lx:\n\n", pcbaddr); printf("Timers:\n"); for (i = 0; i < TCP6T_NTIMERS; i++) { + char buf[128]; ci = (callout_impl_t *)&tcpcb.t_timer[i]; - printf("\t%s: %d", tcptimers[i], - (ci->c_flags & CALLOUT_PENDING) ? - ci->c_time - hardticks : 0); + snprintb(buf, sizeof(buf), CALLOUT_FMT, ci->c_flags); + printf("\t%s\t%s", tcptimers[i], buf); + if (ci->c_flags & CALLOUT_PENDING) + printf("\t%d\n", ci->c_time - hardticks); + else + printf("\n"); } printf("\n\n");
CVS commit: src/external/bsd/openldap/dist/servers/slapd/overlays
Module Name:src Committed By: christos Date: Sat Feb 7 17:58:23 UTC 2015 Modified Files: src/external/bsd/openldap/dist/servers/slapd/overlays: deref.c Log Message: Apply: http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commit;\ h=c32e74763f77675b9e144126e375977ed6dc562c The deref overlay in slapd 2.4.13 through 2.4.40 dereferences a NULL pointer when a search request includes the Deref control with an empty list of attributes to return (missing input validation). [CVE-2015-1545] XXX: Pullup-7 To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 \ src/external/bsd/openldap/dist/servers/slapd/overlays/deref.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/openldap/dist/servers/slapd/overlays/deref.c diff -u src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c:1.1.1.3 src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c:1.2 --- src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c:1.1.1.3 Wed May 28 05:58:52 2014 +++ src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c Sat Feb 7 12:58:23 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: deref.c,v 1.1.1.3 2014/05/28 09:58:52 tron Exp $ */ +/* $NetBSD: deref.c,v 1.2 2015/02/07 17:58:23 christos Exp $ */ /* deref.c - dereference overlay */ /* $OpenLDAP$ */ @@ -185,7 +185,8 @@ deref_parseCtrl ( ber_len_t cnt = sizeof(struct berval); ber_len_t off = 0; - if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR ) + if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR + || !cnt ) { rs->sr_text = "Dereference control: derefSpec decoding error"; rs->sr_err = LDAP_PROTOCOL_ERROR;
CVS commit: src/external/bsd/openldap/dist/servers/slapd
Module Name:src Committed By: christos Date: Sat Feb 7 17:57:00 UTC 2015 Modified Files: src/external/bsd/openldap/dist/servers/slapd: filter.c Log Message: Apply: http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commit;\ h=2f1a2dd329b91afe561cd06b872d09630d4edb6a Certain search queries including the Matched Values control can trigger a double free in slapd 2.4.40 when freeing operation controls. This is a regression in 2.4.40, no earlier releases are affected. [CVE-1546] XXX: Pullup-7 To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 \ src/external/bsd/openldap/dist/servers/slapd/filter.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/openldap/dist/servers/slapd/filter.c diff -u src/external/bsd/openldap/dist/servers/slapd/filter.c:1.1.1.4 src/external/bsd/openldap/dist/servers/slapd/filter.c:1.2 --- src/external/bsd/openldap/dist/servers/slapd/filter.c:1.1.1.4 Wed May 28 05:58:46 2014 +++ src/external/bsd/openldap/dist/servers/slapd/filter.c Sat Feb 7 12:56:59 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: filter.c,v 1.1.1.4 2014/05/28 09:58:46 tron Exp $ */ +/* $NetBSD: filter.c,v 1.2 2015/02/07 17:56:59 christos Exp $ */ /* filter.c - routines for parsing and dealing with filters */ /* $OpenLDAP$ */ @@ -1160,14 +1160,10 @@ get_vrFilter( Operation *op, BerElement void vrFilter_free( Operation *op, ValuesReturnFilter *vrf ) { - ValuesReturnFilter *p, *next; + ValuesReturnFilter *next; - if ( vrf == NULL ) { - return; - } - - for ( p = vrf; p != NULL; p = next ) { - next = p->vrf_next; + for ( p = vrf; vrf != NULL; vrf = next ) { + next = vrf->vrf_next; switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) { case LDAP_FILTER_PRESENT:
CVS commit: src/sys/arch
Module Name:src Committed By: jmcneill Date: Sat Feb 7 17:20:17 UTC 2015 Added Files: src/sys/arch/arm/amlogic: amlogic_board.c amlogic_com.c amlogic_comreg.h amlogic_intr.h amlogic_io.c amlogic_reg.h amlogic_space.c amlogic_var.h files.amlogic src/sys/arch/evbarm/amlogic: amlogic_machdep.c amlogic_start.S genassym.cf platform.h src/sys/arch/evbarm/conf: ODROID-C1 files.amlogic mk.amlogic std.amlogic Log Message: Work-in-progress Odroid-C1 support. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/amlogic/amlogic_board.c \ src/sys/arch/arm/amlogic/amlogic_com.c \ src/sys/arch/arm/amlogic/amlogic_comreg.h \ src/sys/arch/arm/amlogic/amlogic_intr.h \ src/sys/arch/arm/amlogic/amlogic_io.c \ src/sys/arch/arm/amlogic/amlogic_reg.h \ src/sys/arch/arm/amlogic/amlogic_space.c \ src/sys/arch/arm/amlogic/amlogic_var.h \ src/sys/arch/arm/amlogic/files.amlogic cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/amlogic/amlogic_machdep.c \ src/sys/arch/evbarm/amlogic/amlogic_start.S \ src/sys/arch/evbarm/amlogic/genassym.cf \ src/sys/arch/evbarm/amlogic/platform.h cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/ODROID-C1 \ src/sys/arch/evbarm/conf/files.amlogic \ src/sys/arch/evbarm/conf/mk.amlogic src/sys/arch/evbarm/conf/std.amlogic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/arm/amlogic/amlogic_board.c diff -u /dev/null src/sys/arch/arm/amlogic/amlogic_board.c:1.1 --- /dev/null Sat Feb 7 17:20:17 2015 +++ src/sys/arch/arm/amlogic/amlogic_board.c Sat Feb 7 17:20:17 2015 @@ -0,0 +1,65 @@ +/* $NetBSD: amlogic_board.c,v 1.1 2015/02/07 17:20:17 jmcneill Exp $ */ + +/*- + * Copyright (c) 2015 Jared D. McNeill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "opt_amlogic.h" + +#include +__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.1 2015/02/07 17:20:17 jmcneill Exp $"); + +#define _ARM32_BUS_DMA_PRIVATE +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include + +bus_space_handle_t amlogic_core_bsh; + +struct arm32_bus_dma_tag amlogic_dma_tag = { + _BUS_DMAMAP_FUNCS, + _BUS_DMAMEM_FUNCS, + _BUS_DMATAG_FUNCS, +}; + +void +amlogic_bootstrap(void) +{ + int error; + + error = bus_space_map(&amlogic_bs_tag, AMLOGIC_CORE_BASE, + AMLOGIC_CORE_SIZE, 0, &amlogic_core_bsh); + if (error) + panic("%s: failed to map CORE registers: %d", __func__, error); +} Index: src/sys/arch/arm/amlogic/amlogic_com.c diff -u /dev/null src/sys/arch/arm/amlogic/amlogic_com.c:1.1 --- /dev/null Sat Feb 7 17:20:17 2015 +++ src/sys/arch/arm/amlogic/amlogic_com.c Sat Feb 7 17:20:17 2015 @@ -0,0 +1,121 @@ +/* $NetBSD: amlogic_com.c,v 1.1 2015/02/07 17:20:17 jmcneill Exp $ */ + +/*- + * Copyright (c) 2013 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Matt Thomas of 3am Software Foundry. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRES
CVS commit: src/sys/arch/arm
Module Name:src Committed By: jmcneill Date: Sat Feb 7 17:14:32 UTC 2015 Modified Files: src/sys/arch/arm/conf: files.arm src/sys/arch/arm/cortex: a9_mpsubr.S Log Message: According to the Cortex-A5 TRM, the CBAR register is not implemented and always reads as 0x. Add ARM_CBAR option to set this in kernel config. To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.130 src/sys/arch/arm/conf/files.arm cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/cortex/a9_mpsubr.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/conf/files.arm diff -u src/sys/arch/arm/conf/files.arm:1.129 src/sys/arch/arm/conf/files.arm:1.130 --- src/sys/arch/arm/conf/files.arm:1.129 Mon Dec 1 08:39:43 2014 +++ src/sys/arch/arm/conf/files.arm Sat Feb 7 17:14:32 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files.arm,v 1.129 2014/12/01 08:39:43 matt Exp $ +# $NetBSD: files.arm,v 1.130 2015/02/07 17:14:32 jmcneill Exp $ # temporary define to allow easy moving to ../arch/arm/arm32 defflagARM32 @@ -68,6 +68,8 @@ defflag opt_cpuoptions.h ARM_HAS_LPAE # use extended small page in compatible MMU mode for ARMv6 defflag opt_cpuoptions.h SHEEVA_L2_CACHE defflag opt_cpuoptions.h SHEEVA_L2_CACHE_WT: SHEEVA_L2_CACHE +# override configuration base address register +defparam opt_cpuoptions.h ARM_CBAR # Interrupt implementation header definition. defparam opt_arm_intr_impl.h ARM_INTR_IMPL Index: src/sys/arch/arm/cortex/a9_mpsubr.S diff -u src/sys/arch/arm/cortex/a9_mpsubr.S:1.27 src/sys/arch/arm/cortex/a9_mpsubr.S:1.28 --- src/sys/arch/arm/cortex/a9_mpsubr.S:1.27 Sat Feb 7 02:39:56 2015 +++ src/sys/arch/arm/cortex/a9_mpsubr.S Sat Feb 7 17:14:32 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: a9_mpsubr.S,v 1.27 2015/02/07 02:39:56 jmcneill Exp $ */ +/* $NetBSD: a9_mpsubr.S,v 1.28 2015/02/07 17:14:32 jmcneill Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -365,7 +365,12 @@ cortex_init: // Step 1a, invalidate the all cache tags in all ways on the SCU. // XPUTC(#65) +#if defined(ARM_CBAR) + movw r3, #:lower16:ARM_CBAR + movt r3, #:upper16:ARM_CBAR +#else mrc p15, 4, r3, c15, c0, 0 // read cbar +#endif #ifdef __ARMEB__ setend le #endif @@ -419,7 +424,12 @@ cortex_init: // // Step 3, enable the SCU // +#if defined(ARM_CBAR) + movw r3, #:lower16:ARM_CBAR + movt r3, #:upper16:ARM_CBAR +#else mrc p15, 4, r3, c15, c0, 0 // read cbar +#endif #ifdef __ARMEB__ setend le #endif
CVS commit: src/usr.bin/kdump
Module Name:src Committed By: christos Date: Sat Feb 7 14:37:42 UTC 2015 Modified Files: src/usr.bin/kdump: Makefile.ioctl-c Log Message: Add QXL, re-enable I915 To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/kdump/Makefile.ioctl-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.bin/kdump/Makefile.ioctl-c diff -u src/usr.bin/kdump/Makefile.ioctl-c:1.27 src/usr.bin/kdump/Makefile.ioctl-c:1.28 --- src/usr.bin/kdump/Makefile.ioctl-c:1.27 Sat Feb 7 06:24:55 2015 +++ src/usr.bin/kdump/Makefile.ioctl-c Sat Feb 7 09:37:42 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.ioctl-c,v 1.27 2015/02/07 11:24:55 martin Exp $ +# $NetBSD: Makefile.ioctl-c,v 1.28 2015/02/07 14:37:42 christos Exp $ # NOTE: needs to be previously .included for NETBSDSRCDIR @@ -41,7 +41,8 @@ CPPFLAGS+= -I${DESTDIR}/usr/X11R7/includ CPPFLAGS+= -D_ALTQ_ALTQ_JOBS_H_ # redefinition of inline # De-select one, dup ioctls CPPFLAGS+= -D_VIA_DRM_H_ # Missing header -CPPFLAGS+= -D_I915_DRM_H_ # Dup ioctls +#CPPFLAGS+= -D_I915_DRM_H_ # Dup ioctls +CPPFLAGS+= -DQXL_DRM_H # Dup ioctls CPPFLAGS+= -D__R128_DRM_H__ # Dup ioctls CPPFLAGS+= -D__SIS_DRM_H__ # Dup ioctls CPPFLAGS+= -D__SAVAGE_DRM_H__ # Dup ioctls
CVS commit: src/sys/fs/nfs/common
Module Name:src Committed By: mlelstv Date: Sat Feb 7 12:50:25 UTC 2015 Modified Files: src/sys/fs/nfs/common: krpc_subr.c Log Message: invalidate input mbuf as soon as it is consumed by the mbuf chain to avoid a double free later. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nfs/common/krpc_subr.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/fs/nfs/common/krpc_subr.c diff -u src/sys/fs/nfs/common/krpc_subr.c:1.2 src/sys/fs/nfs/common/krpc_subr.c:1.3 --- src/sys/fs/nfs/common/krpc_subr.c:1.2 Sat Feb 7 04:06:52 2015 +++ src/sys/fs/nfs/common/krpc_subr.c Sat Feb 7 12:50:25 2015 @@ -44,7 +44,7 @@ #include /* __FBSDID("FreeBSD: head/sys/nfs/krpc_subr.c 248207 2013-03-12 13:42:47Z glebius "); */ -__RCSID("$NetBSD: krpc_subr.c,v 1.2 2015/02/07 04:06:52 christos Exp $"); +__RCSID("$NetBSD: krpc_subr.c,v 1.3 2015/02/07 12:50:25 mlelstv Exp $"); #include #include @@ -279,6 +279,7 @@ krpc_call(struct sockaddr_in *sa, u_int */ mhead = m_gethdr(M_WAITOK, MT_DATA); mhead->m_next = *data; + *data = NULL; call = mtod(mhead, struct krpc_call *); mhead->m_len = sizeof(*call); bzero((caddr_t)call, sizeof(*call));
CVS commit: src/usr.bin/kdump
Module Name:src Committed By: martin Date: Sat Feb 7 11:24:55 UTC 2015 Modified Files: src/usr.bin/kdump: Makefile.ioctl-c Log Message: Drop i915, it still causes duplicate case statements (DRM_IOCTL_QXL_UPDATE_AREA == DRM_IOCTL_I915_BATCHBUFFER) To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.bin/kdump/Makefile.ioctl-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.bin/kdump/Makefile.ioctl-c diff -u src/usr.bin/kdump/Makefile.ioctl-c:1.26 src/usr.bin/kdump/Makefile.ioctl-c:1.27 --- src/usr.bin/kdump/Makefile.ioctl-c:1.26 Fri Feb 6 20:07:45 2015 +++ src/usr.bin/kdump/Makefile.ioctl-c Sat Feb 7 11:24:55 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.ioctl-c,v 1.26 2015/02/06 20:07:45 christos Exp $ +# $NetBSD: Makefile.ioctl-c,v 1.27 2015/02/07 11:24:55 martin Exp $ # NOTE: needs to be previously .included for NETBSDSRCDIR @@ -41,7 +41,7 @@ CPPFLAGS+= -I${DESTDIR}/usr/X11R7/includ CPPFLAGS+= -D_ALTQ_ALTQ_JOBS_H_ # redefinition of inline # De-select one, dup ioctls CPPFLAGS+= -D_VIA_DRM_H_ # Missing header -#CPPFLAGS+= -D_I915_DRM_H_ # Dup ioctls +CPPFLAGS+= -D_I915_DRM_H_ # Dup ioctls CPPFLAGS+= -D__R128_DRM_H__ # Dup ioctls CPPFLAGS+= -D__SIS_DRM_H__ # Dup ioctls CPPFLAGS+= -D__SAVAGE_DRM_H__ # Dup ioctls
CVS commit: src/sys/fs/nilfs
Module Name:src Committed By: maxv Date: Sat Feb 7 10:40:57 UTC 2015 Modified Files: src/sys/fs/nilfs: nilfs_vfsops.c Log Message: Revert previous, it was a false positive. In nilfs_mount_device() there's one branch where the node is not released: when the device is already mounted. Not releasing it was thus intentional, but this is something code scanners can't understand. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/fs/nilfs/nilfs_vfsops.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/fs/nilfs/nilfs_vfsops.c diff -u src/sys/fs/nilfs/nilfs_vfsops.c:1.19 src/sys/fs/nilfs/nilfs_vfsops.c:1.20 --- src/sys/fs/nilfs/nilfs_vfsops.c:1.19 Sat Feb 7 04:25:16 2015 +++ src/sys/fs/nilfs/nilfs_vfsops.c Sat Feb 7 10:40:57 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: nilfs_vfsops.c,v 1.19 2015/02/07 04:25:16 christos Exp $ */ +/* $NetBSD: nilfs_vfsops.c,v 1.20 2015/02/07 10:40:57 maxv Exp $ */ /* * Copyright (c) 2008, 2009 Reinoud Zandijk @@ -28,7 +28,7 @@ #include #ifndef lint -__KERNEL_RCSID(0, "$NetBSD: nilfs_vfsops.c,v 1.19 2015/02/07 04:25:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nilfs_vfsops.c,v 1.20 2015/02/07 10:40:57 maxv Exp $"); #endif /* not lint */ @@ -879,10 +879,8 @@ nilfs_mount(struct mount *mp, const char #endif error = nilfs_mount_device(devvp, mp, args, &nilfsdev); - if (error) { - vrele(devvp); + if (error) return error; - } /* * Create a nilfs_mount on the specified checkpoint. Note that only
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: wiz Date: Sat Feb 7 09:59:47 UTC 2015 Modified Files: src/games/fortune/datfiles: fortunes-o.real Log Message: Fix typo. From kspillner@OpenBSD, forwarded by jmc@OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/games/fortune/datfiles/fortunes-o.real Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes-o.real diff -u src/games/fortune/datfiles/fortunes-o.real:1.11 src/games/fortune/datfiles/fortunes-o.real:1.12 --- src/games/fortune/datfiles/fortunes-o.real:1.11 Sun Feb 17 13:39:51 2013 +++ src/games/fortune/datfiles/fortunes-o.real Sat Feb 7 09:59:47 2015 @@ -417,7 +417,7 @@ licentious, dirty bum!! % Floppy now, hard later. % -For those of you how have been looking for evidence that a working +For those of you who have been looking for evidence that a working version of "Star Wars" can be built, consider the following proof offered by Caspar Weinberger: