CVS commit: src/external/gpl3/gdb/lib/libbfd/arch/mips64eb
Module Name:src
Committed By: matt
Date: Sat May 23 01:45:08 UTC 2015
Modified Files:
src/external/gpl3/gdb/lib/libbfd/arch/mips64eb: defs.mk
Log Message:
Regen for N32 target vectors.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/defs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/defs.mk
diff -u src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/defs.mk:1.4 src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/defs.mk:1.5
--- src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/defs.mk:1.4 Thu May 7 14:43:30 2015
+++ src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/defs.mk Sat May 23 01:45:08 2015
@@ -2,8 +2,8 @@
# Generated from: NetBSD: mknative-gdb,v 1.6 2013/10/03 18:58:37 christos Exp
# Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp
#
-G_libbfd_la_DEPENDENCIES=elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo elf.lo elflink.lo elf-attrs.lo elf-strtab.lo elf-eh-frame.lo dwarf1.lo ecofflink.lo elf64-mips.lo elf64.lo coff-mips.lo ecoff.lo elf64-gen.lo elf32-gen.lo cpu-mips.lo netbsd-core.lo archive64.lo ofiles
+G_libbfd_la_DEPENDENCIES=elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo elf.lo elflink.lo elf-attrs.lo elf-strtab.lo elf-eh-frame.lo dwarf1.lo ecofflink.lo elfn32-mips.lo elf64-mips.lo elf64.lo coff-mips.lo ecoff.lo elf64-gen.lo elf32-gen.lo cpu-mips.lo netbsd-core.lo archive64.lo ofiles
G_libbfd_la_OBJECTS=archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo cache.lo coffgen.lo corefile.lo format.lo init.lo libbfd.lo opncls.lo reloc.lo section.lo syms.lo targets.lo hash.lo linker.lo srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo merge.lo dwarf2.lo simple.lo compress.lo verilog.lo
G_DEFS=-DHAVE_CONFIG_H
-G_INCLUDES=-DNETBSD_CORE -I. -I${GNUHOSTDIST}/bfd -I${GNUHOSTDIST}/bfd/../include -DHAVE_bfd_elf32_tradbigmips_vec -DHAVE_bfd_elf32_tradlittlemips_vec -DHAVE_bfd_elf64_tradbigmips_vec -DHAVE_bfd_elf64_tradlittlemips_vec -DHAVE_ecoff_big_vec -DHAVE_ecoff_little_vec -DHAVE_bfd_elf64_little_generic_vec -DHAVE_bfd_elf64_big_generic_vec -DHAVE_bfd_elf32_little_generic_vec -DHAVE_bfd_elf32_big_generic_vec -I./../intl
-G_TDEFAULTS=-DDEFAULT_VECTOR=bfd_elf32_tradbigmips_vec -DSELECT_VECS='&bfd_elf32_tradbigmips_vec,&bfd_elf32_tradlittlemips_vec,&bfd_elf64_tradbigmips_vec,&bfd_elf64_tradlittlemips_vec,&ecoff_big_vec,&ecoff_little_vec,&bfd_elf64_little_generic_vec,&bfd_elf64_big_generic_vec,&bfd_elf32_little_generic_vec,&bfd_elf32_big_generic_vec' -DSELECT_ARCHITECTURES='&bfd_mips_arch'
+G_INCLUDES=-DNETBSD_CORE -I. -I${GNUHOSTDIST}/bfd -I${GNUHOSTDIST}/bfd/../include -DHAVE_bfd_elf32_tradbigmips_vec -DHAVE_bfd_elf32_tradlittlemips_vec -DHAVE_bfd_elf32_ntradbigmips_vec -DHAVE_bfd_elf32_ntradlittlemips_vec -DHAVE_bfd_elf64_tradbigmips_vec -DHAVE_bfd_elf64_tradlittlemips_vec -DHAVE_ecoff_big_vec -DHAVE_ecoff_little_vec -DHAVE_bfd_elf64_little_generic_vec -DHAVE_bfd_elf64_big_generic_vec -DHAVE_bfd_elf32_little_generic_vec -DHAVE_bfd_elf32_big_generic_vec -I./../intl
+G_TDEFAULTS=-DDEFAULT_VECTOR=bfd_elf32_tradbigmips_vec -DSELECT_VECS='&bfd_elf32_tradbigmips_vec,&bfd_elf32_tradlittlemips_vec,&bfd_elf32_ntradbigmips_vec,&bfd_elf32_ntradlittlemips_vec,&bfd_elf64_tradbigmips_vec,&bfd_elf64_tradlittlemips_vec,&ecoff_big_vec,&ecoff_little_vec,&bfd_elf64_little_generic_vec,&bfd_elf64_big_generic_vec,&bfd_elf32_little_generic_vec,&bfd_elf32_big_generic_vec' -DSELECT_ARCHITECTURES='&bfd_mips_arch'
CVS commit: src/external/gpl3/gdb/dist/bfd
Module Name:src
Committed By: matt
Date: Sat May 23 01:41:02 UTC 2015
Modified Files:
src/external/gpl3/gdb/dist/bfd: config.bfd
Log Message:
Add the mips n32 target vectors.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/bfd/config.bfd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/bfd/config.bfd
diff -u src/external/gpl3/gdb/dist/bfd/config.bfd:1.6 src/external/gpl3/gdb/dist/bfd/config.bfd:1.7
--- src/external/gpl3/gdb/dist/bfd/config.bfd:1.6 Sun Aug 10 05:57:30 2014
+++ src/external/gpl3/gdb/dist/bfd/config.bfd Sat May 23 01:41:02 2015
@@ -972,11 +972,11 @@ case "${targ}" in
#ifdef BFD64
mips*el-*-netbsd*)
targ_defvec=bfd_elf32_tradlittlemips_vec
-targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_little_vec ecoff_big_vec"
+targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_little_vec ecoff_big_vec"
;;
mips*-*-netbsd*)
targ_defvec=bfd_elf32_tradbigmips_vec
-targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
+targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
;;
#endif
mips*-dec-* | mips*el-*-ecoff*)
CVS commit: src/sys/netsmb
Module Name:src
Committed By: rtr
Date: Fri May 22 22:05:32 UTC 2015
Modified Files:
src/sys/netsmb: smb_trantcp.c
Log Message:
pass connect address directly to soconnect()
instead of allocating an mbuf, copying the address into it and then
mtod()'ing it back to a sockaddr * for soconnect.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/netsmb/smb_trantcp.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/netsmb/smb_trantcp.c
diff -u src/sys/netsmb/smb_trantcp.c:1.48 src/sys/netsmb/smb_trantcp.c:1.49
--- src/sys/netsmb/smb_trantcp.c:1.48 Sat May 2 17:18:04 2015
+++ src/sys/netsmb/smb_trantcp.c Fri May 22 22:05:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_trantcp.c,v 1.48 2015/05/02 17:18:04 rtr Exp $ */
+/* $NetBSD: smb_trantcp.c,v 1.49 2015/05/22 22:05:32 rtr Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: smb_trantcp.c,v 1.48 2015/05/02 17:18:04 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_trantcp.c,v 1.49 2015/05/22 22:05:32 rtr Exp $");
#include
#include
@@ -161,7 +161,6 @@ nb_connect_in(struct nbpcb *nbp, struct
{
struct socket *so;
int error;
- struct mbuf *m;
error = socreate(AF_INET, &so, SOCK_STREAM, IPPROTO_TCP, l, NULL);
if (error)
@@ -181,12 +180,8 @@ nb_connect_in(struct nbpcb *nbp, struct
goto bad;
nb_setsockopt_int(so, SOL_SOCKET, SO_KEEPALIVE, 1);
nb_setsockopt_int(so, IPPROTO_TCP, TCP_NODELAY, 1);
- m = m_get(M_WAIT, MT_SONAME);
- *mtod(m, struct sockaddr *) = *(struct sockaddr *)to;
- m->m_len = sizeof(struct sockaddr);
solock(so);
- error = soconnect(so, mtod(m, struct sockaddr*), l);
- m_free(m);
+ error = soconnect(so, (struct sockaddr *)to, l);
if (error) {
sounlock(so);
goto bad;
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Fri May 22 18:27:04 UTC 2015 Modified Files: src/distrib/notes/common: legal.common Log Message: bah. this time without a typo. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.95 src/distrib/notes/common/legal.common:1.96 --- src/distrib/notes/common/legal.common:1.95 Fri May 22 18:26:19 2015 +++ src/distrib/notes/common/legal.common Fri May 22 18:27:03 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD" +.\" $NetBSD: legal.common,v 1.96 2015/05/22 18:27:03 snj Exp $ .\" .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\" All rights reserved.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Fri May 22 18:26:19 UTC 2015 Modified Files: src/distrib/notes/common: legal.common Log Message: restore rcsid accidentally deleted in previous To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.94 src/distrib/notes/common/legal.common:1.95 --- src/distrib/notes/common/legal.common:1.94 Wed May 20 05:19:20 2015 +++ src/distrib/notes/common/legal.common Fri May 22 18:26:19 2015 @@ -1,3 +1,4 @@ +.\" $NetBSD" .\" .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\" All rights reserved.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Fri May 22 17:33:15 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 795, 796, 789, 797 To generate a diff of this commit: cvs rdiff -u -r1.1.2.305 -r1.1.2.306 src/doc/CHANGES-7.0 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 diff -u src/doc/CHANGES-7.0:1.1.2.305 src/doc/CHANGES-7.0:1.1.2.306 --- src/doc/CHANGES-7.0:1.1.2.305 Wed May 20 02:47:17 2015 +++ src/doc/CHANGES-7.0 Fri May 22 17:33:15 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.305 2015/05/20 02:47:17 msaitoh Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.306 2015/05/22 17:33:15 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -23353,3 +23353,29 @@ crypto/dist/ipsec-tools/src/racoon/gssap https://www.altsci.com/ipsec/ - Detect error earlier to avoid memory leak. [christos, ticket #792] + +sys/arch/x86/x86/lapic.c 1.48 + + Workaround for "lapic_set_lvt: bad pin value %d" panic on + some (broken?) BIOS systems. Don't panic when a local APIC's + interrput input pin number (LINTx) > 1. Instead, print a + warning message and continue. The default is pin 1. + [msaitoh, ticket #795] + +sys/arch/xen/xen/xenevt.c 1.42 + + Fix off by one error. PR port-xen/49919. + [bouyer, ticket #796] + +lib/libpam/libpam/Makefile 1.18 + + When building with clang, make warnings about NULL checks of + parameters with attribute nonnull non-fatal. + [joerg, ticket #789] + +sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c 1.4 + + Fix kassert: npdp may be GEN8_LEGACY_PDPS exactly. + Gets Broadwell booting. + [riastradh, ticket #797] +
CVS commit: [netbsd-7] src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src Committed By: snj Date: Fri May 22 17:28:37 UTC 2015 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: i915_gem_gtt.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #797): sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c: revision 1.4 Fix kassert: npdp may be GEN8_LEGACY_PDPS exactly. Tripped over by msaitoh, our first Broadwell user, apparently. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.2.1 \ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.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/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.3.2.1 --- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c:1.3 Mon Jul 21 20:01:18 2014 +++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c Fri May 22 17:28:37 2015 @@ -575,7 +575,7 @@ gen8_ppgtt_allocate_page_directories(str ppgtt->u.gen8->npdp = npdp; - KASSERT(nsegs < GEN8_LEGACY_PDPS); + KASSERT(nsegs <= GEN8_LEGACY_PDPS); CTASSERT(GEN8_LEGACY_PDPS == __arraycount(ppgtt->u.gen8->pd_segs)); /* XXX errno NetBSD->Linux */
CVS commit: [netbsd-7] src/lib/libpam/libpam
Module Name:src
Committed By: snj
Date: Fri May 22 16:58:47 UTC 2015
Modified Files:
src/lib/libpam/libpam [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by joerg in ticket #789):
lib/libpam/libpam/Makefile: revision 1.18
When building with clang, make warnings about NULL checks of parameters
with attribute nonnull non-fatal.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.4.1 src/lib/libpam/libpam/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/libpam/Makefile
diff -u src/lib/libpam/libpam/Makefile:1.16 src/lib/libpam/libpam/Makefile:1.16.4.1
--- src/lib/libpam/libpam/Makefile:1.16 Sat Dec 28 18:04:18 2013
+++ src/lib/libpam/libpam/Makefile Fri May 22 16:58:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/12/28 18:04:18 christos Exp $
+# $NetBSD: Makefile,v 1.16.4.1 2015/05/22 16:58:47 snj Exp $
#-
# Copyright (c) 1998 Juniper Networks, Inc.
# All rights reserved.
@@ -204,6 +204,8 @@ openpam_static_modules.o: openpam_static
${CC} ${LDFLAGS} -nostdlib -o ${.TARGET} -r -Wl,--whole-archive \
openpam_static.o ${STATIC_MODULE_LIBS}
+CWARNFLAGS.clang+= -Wno-error=tautological-pointer-compare
+
.include
.PATH.h: ${DIST}/include
.PATH.c: ${DIST}/lib
CVS commit: [netbsd-7] src/sys/arch/xen/xen
Module Name:src
Committed By: snj
Date: Fri May 22 16:56:45 UTC 2015
Modified Files:
src/sys/arch/xen/xen [netbsd-7]: xenevt.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #796):
sys/arch/xen/xen/xenevt.c: revision 1.42
Fix off by one error, pointed out by Wei Liu in port-xen/49919
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/arch/xen/xen/xenevt.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/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.41 src/sys/arch/xen/xen/xenevt.c:1.41.2.1
--- src/sys/arch/xen/xen/xenevt.c:1.41 Fri Jul 25 08:10:35 2014
+++ src/sys/arch/xen/xen/xenevt.c Fri May 22 16:56:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xenevt.c,v 1.41 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: xenevt.c,v 1.41.2.1 2015/05/22 16:56:45 snj Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.41 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.41.2.1 2015/05/22 16:56:45 snj Exp $");
#include "opt_xen.h"
#include
@@ -489,7 +489,7 @@ xenevt_fwrite(struct file *fp, off_t *of
if (uio->uio_resid == 0)
return (0);
nentries = uio->uio_resid / sizeof(uint16_t);
- if (nentries > NR_EVENT_CHANNELS)
+ if (nentries >= NR_EVENT_CHANNELS)
return EMSGSIZE;
chans = kmem_alloc(nentries * sizeof(uint16_t), KM_SLEEP);
if (chans == NULL)
@@ -582,7 +582,7 @@ xenevt_fioctl(struct file *fp, u_long cm
{
struct ioctl_evtchn_unbind *unbind = addr;
- if (unbind->port > NR_EVENT_CHANNELS)
+ if (unbind->port >= NR_EVENT_CHANNELS)
return EINVAL;
mutex_enter(&devevent_lock);
if (devevent[unbind->port] != d) {
@@ -603,7 +603,7 @@ xenevt_fioctl(struct file *fp, u_long cm
{
struct ioctl_evtchn_notify *notify = addr;
- if (notify->port > NR_EVENT_CHANNELS)
+ if (notify->port >= NR_EVENT_CHANNELS)
return EINVAL;
mutex_enter(&devevent_lock);
if (devevent[notify->port] != d) {
CVS commit: [netbsd-7] src/sys/arch/x86/x86
Module Name:src
Committed By: snj
Date: Fri May 22 16:53:32 UTC 2015
Modified Files:
src/sys/arch/x86/x86 [netbsd-7]: lapic.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #795):
sys/arch/x86/x86/lapic.c: revision 1.48
Workaround for "lapic_set_lvt: bad pin value %d" panic on some (broken?) BIOS
system. Don't panic when a local APIC's interrput input pin number (LINTx) > 1.
Instead, print warning message and continue. The default is pin 1.
Same as Linux (and perhaps FreeBSD). Tested with Shuttle DS57U.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.47.4.1 src/sys/arch/x86/x86/lapic.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/lapic.c
diff -u src/sys/arch/x86/x86/lapic.c:1.47 src/sys/arch/x86/x86/lapic.c:1.47.4.1
--- src/sys/arch/x86/x86/lapic.c:1.47 Fri Nov 15 08:47:55 2013
+++ src/sys/arch/x86/x86/lapic.c Fri May 22 16:53:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lapic.c,v 1.47 2013/11/15 08:47:55 msaitoh Exp $ */
+/* $NetBSD: lapic.c,v 1.47.4.1 2015/05/22 16:53:32 snj Exp $ */
/*-
* Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.47 2013/11/15 08:47:55 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.47.4.1 2015/05/22 16:53:32 snj Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -182,11 +182,10 @@ lapic_set_lvt(void)
mpi = &mp_intrs[i];
if (mpi->ioapic == NULL && (mpi->cpu_id == MPS_ALL_APICS ||
mpi->cpu_id == ci->ci_cpuid)) {
-#ifdef DIAGNOSTIC
if (mpi->ioapic_pin > 1)
-panic("lapic_set_lvt: bad pin value %d",
-mpi->ioapic_pin);
-#endif
+aprint_error_dev(ci->ci_dev,
+"%s: WARNING: bad pin value %d\n",
+__func__, mpi->ioapic_pin);
if (mpi->ioapic_pin == 0)
i82489_writereg(LAPIC_LVINT0, mpi->redir);
else
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: nonaka
Date: Fri May 22 15:32:21 UTC 2015
Modified Files:
src/sys/dev/pci: if_iwm.c
Log Message:
Limit the number of dma segments used for transmitting packets to
IWM_NUM_OF_TBS - 2. We have IWM_NUM_OF_TBS slots, but use two of those
for sending commands to the firmware.
>From OpenBSD rev. 1.41.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/if_iwm.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/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.34 src/sys/dev/pci/if_iwm.c:1.35
--- src/sys/dev/pci/if_iwm.c:1.34 Sat May 16 07:58:19 2015
+++ src/sys/dev/pci/if_iwm.c Fri May 22 15:32:21 2015
@@ -1,5 +1,5 @@
-/* $NetBSD: if_iwm.c,v 1.34 2015/05/16 07:58:19 nonaka Exp $ */
-/* OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp */
+/* $NetBSD: if_iwm.c,v 1.35 2015/05/22 15:32:21 nonaka Exp $ */
+/* OpenBSD: if_iwm.c,v 1.41 2015/05/22 06:50:54 kettenis Exp */
/*
* Copyright (c) 2014 genua mbh
@@ -105,7 +105,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.34 2015/05/16 07:58:19 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.35 2015/05/22 15:32:21 nonaka Exp $");
#include
#include
@@ -1224,7 +1224,7 @@ iwm_alloc_tx_ring(struct iwm_softc *sc,
paddr += sizeof(struct iwm_device_cmd);
error = bus_dmamap_create(sc->sc_dmat, IWM_RBUF_SIZE,
- IWM_NUM_OF_TBS, IWM_RBUF_SIZE, 0, BUS_DMA_NOWAIT,
+ IWM_NUM_OF_TBS - 2, IWM_RBUF_SIZE, 0, BUS_DMA_NOWAIT,
&data->map);
if (error != 0) {
aprint_error_dev(sc->sc_dev,
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: sborrill Date: Fri May 22 11:45:01 UTC 2015 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: Ticket #1965 To generate a diff of this commit: cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/doc/CHANGES-5.2.4 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-5.2.4 diff -u src/doc/CHANGES-5.2.4:1.1.2.27 src/doc/CHANGES-5.2.4:1.1.2.28 --- src/doc/CHANGES-5.2.4:1.1.2.27 Sun Apr 26 12:53:34 2015 +++ src/doc/CHANGES-5.2.4 Fri May 22 11:45:01 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.4,v 1.1.2.27 2015/04/26 12:53:34 msaitoh Exp $ +# $NetBSD: CHANGES-5.2.4,v 1.1.2.28 2015/05/22 11:45:01 sborrill Exp $ A complete list of changes from the NetBSD 5.2.3 release to the NetBSD 5.2.4 release: @@ -2565,13 +2565,13 @@ xsrc/xfree/xc/lib/font/bitmap/bdfread.c (bdfReadCharacters: ensure metrics fit into xCharInfo struct) [mrg, ticket #1953] -crypto/dist/openssl/dist/crypto/asn1/a_type.c 1.2 -crypto/dist/openssl/dist/crypto/asn1/tasn_dec.c 1.2 -crypto/dist/openssl/dist/crypto/pkcs7/pk7_doit.c 1.2 -crypto/dist/openssl/dist/crypto/pkcs7/pk7_lib.c 1.2 -crypto/dist/openssl/dist/doc/crypto/d2i_X509.pod 1.2 -crypto/dist/openssl/dist/ssl/s2_lib.c 1.3 -crypto/dist/openssl/dist/ssl/s2_srvr.c 1.2 +crypto/dist/openssl/dist/crypto/asn1/a_type.c 1.2 +crypto/dist/openssl/dist/crypto/asn1/tasn_dec.c 1.2 +crypto/dist/openssl/dist/crypto/pkcs7/pk7_doit.c 1.2 +crypto/dist/openssl/dist/crypto/pkcs7/pk7_lib.c 1.2 +crypto/dist/openssl/dist/doc/crypto/d2i_X509.pod 1.2 +crypto/dist/openssl/dist/ssl/s2_lib.c 1.3 +crypto/dist/openssl/dist/ssl/s2_srvr.c 1.2 Address OpenSSL Security Advisory [19 Mar 2015]: RSA silently downgrades to EXPORT_RSA [Client] (CVE-2015-0204) @@ -2606,3 +2606,9 @@ sys/kern/sys_select.cpatch exceeded, then return EINVAL instead of silently truncating the list. Addresses PR/17507. [prlw1, ticket #1957] + +sys/arch/xen/xen/xenevt.c 1.42 + + Fix off by one error, addresses port-xen/49919. + [bouyer, ticket #1965] +
CVS commit: [netbsd-5-2] src/sys/arch/xen/xen
Module Name:src
Committed By: sborrill
Date: Fri May 22 11:44:25 UTC 2015
Modified Files:
src/sys/arch/xen/xen [netbsd-5-2]: xenevt.c
Log Message:
Pull up the following revisions(s) (requested by bouyer in ticket #1965):
sys/arch/xen/xen/xenevt.c: revision 1.42
Fix off by one error, addresses port-xen/49919.
To generate a diff of this commit:
cvs rdiff -u -r1.29.4.2 -r1.29.4.2.6.1 src/sys/arch/xen/xen/xenevt.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/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.29.4.2 src/sys/arch/xen/xen/xenevt.c:1.29.4.2.6.1
--- src/sys/arch/xen/xen/xenevt.c:1.29.4.2 Wed Sep 30 00:08:03 2009
+++ src/sys/arch/xen/xen/xenevt.c Fri May 22 11:44:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xenevt.c,v 1.29.4.2 2009/09/30 00:08:03 snj Exp $ */
+/* $NetBSD: xenevt.c,v 1.29.4.2.6.1 2015/05/22 11:44:25 sborrill Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.29.4.2 2009/09/30 00:08:03 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.29.4.2.6.1 2015/05/22 11:44:25 sborrill Exp $");
#include "opt_xen.h"
#include
@@ -496,7 +496,7 @@ xenevt_fwrite(struct file *fp, off_t *of
if (uio->uio_resid == 0)
return (0);
nentries = uio->uio_resid / sizeof(uint16_t);
- if (nentries > NR_EVENT_CHANNELS)
+ if (nentries >= NR_EVENT_CHANNELS)
return EMSGSIZE;
chans = kmem_alloc(nentries * sizeof(uint16_t), KM_SLEEP);
if (chans == NULL)
@@ -580,7 +580,7 @@ xenevt_fioctl(struct file *fp, u_long cm
{
struct ioctl_evtchn_unbind *unbind = addr;
- if (unbind->port > NR_EVENT_CHANNELS)
+ if (unbind->port >= NR_EVENT_CHANNELS)
return EINVAL;
if (devevent[unbind->port] != d)
return ENOTCONN;
@@ -596,7 +596,7 @@ xenevt_fioctl(struct file *fp, u_long cm
{
struct ioctl_evtchn_notify *notify = addr;
- if (notify->port > NR_EVENT_CHANNELS)
+ if (notify->port >= NR_EVENT_CHANNELS)
return EINVAL;
if (devevent[notify->port] != d)
return ENOTCONN;
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: sborrill Date: Fri May 22 11:22:34 UTC 2015 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: Ticket #1965 To generate a diff of this commit: cvs rdiff -u -r1.1.2.26 -r1.1.2.27 src/doc/CHANGES-5.1.6 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-5.1.6 diff -u src/doc/CHANGES-5.1.6:1.1.2.26 src/doc/CHANGES-5.1.6:1.1.2.27 --- src/doc/CHANGES-5.1.6:1.1.2.26 Sun Apr 26 12:55:28 2015 +++ src/doc/CHANGES-5.1.6 Fri May 22 11:22:34 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.6,v 1.1.2.26 2015/04/26 12:55:28 msaitoh Exp $ +# $NetBSD: CHANGES-5.1.6,v 1.1.2.27 2015/05/22 11:22:34 sborrill Exp $ A complete list of changes from the NetBSD 5.1.5 release to the NetBSD 5.1.6 release: @@ -2606,3 +2606,9 @@ sys/kern/sys_select.cpatch exceeded, then return EINVAL instead of silently truncating the list. Addresses PR/17507. [prlw1, ticket #1957] + +sys/arch/xen/xen/xenevt.c 1.42 + + Fix off by one error, addresses port-xen/49919. + [bouyer, ticket #1965] +
CVS commit: [netbsd-5-1] src/sys/arch/xen/xen
Module Name:src
Committed By: sborrill
Date: Fri May 22 11:22:03 UTC 2015
Modified Files:
src/sys/arch/xen/xen [netbsd-5-1]: xenevt.c
Log Message:
Pull up the following revisions(s) (requested by bouyer in ticket #1965):
sys/arch/xen/xen/xenevt.c: revision 1.42
Fix off by one error, addresses port-xen/49919.
To generate a diff of this commit:
cvs rdiff -u -r1.29.4.2 -r1.29.4.2.2.1 src/sys/arch/xen/xen/xenevt.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/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.29.4.2 src/sys/arch/xen/xen/xenevt.c:1.29.4.2.2.1
--- src/sys/arch/xen/xen/xenevt.c:1.29.4.2 Wed Sep 30 00:08:03 2009
+++ src/sys/arch/xen/xen/xenevt.c Fri May 22 11:22:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xenevt.c,v 1.29.4.2 2009/09/30 00:08:03 snj Exp $ */
+/* $NetBSD: xenevt.c,v 1.29.4.2.2.1 2015/05/22 11:22:03 sborrill Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.29.4.2 2009/09/30 00:08:03 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.29.4.2.2.1 2015/05/22 11:22:03 sborrill Exp $");
#include "opt_xen.h"
#include
@@ -496,7 +496,7 @@ xenevt_fwrite(struct file *fp, off_t *of
if (uio->uio_resid == 0)
return (0);
nentries = uio->uio_resid / sizeof(uint16_t);
- if (nentries > NR_EVENT_CHANNELS)
+ if (nentries >= NR_EVENT_CHANNELS)
return EMSGSIZE;
chans = kmem_alloc(nentries * sizeof(uint16_t), KM_SLEEP);
if (chans == NULL)
@@ -580,7 +580,7 @@ xenevt_fioctl(struct file *fp, u_long cm
{
struct ioctl_evtchn_unbind *unbind = addr;
- if (unbind->port > NR_EVENT_CHANNELS)
+ if (unbind->port >= NR_EVENT_CHANNELS)
return EINVAL;
if (devevent[unbind->port] != d)
return ENOTCONN;
@@ -596,7 +596,7 @@ xenevt_fioctl(struct file *fp, u_long cm
{
struct ioctl_evtchn_notify *notify = addr;
- if (notify->port > NR_EVENT_CHANNELS)
+ if (notify->port >= NR_EVENT_CHANNELS)
return EINVAL;
if (devevent[notify->port] != d)
return ENOTCONN;
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: sborrill Date: Fri May 22 11:05:57 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket #1965 To generate a diff of this commit: cvs rdiff -u -r1.1.2.114 -r1.1.2.115 src/doc/CHANGES-5.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-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.114 src/doc/CHANGES-5.3:1.1.2.115 --- src/doc/CHANGES-5.3:1.1.2.114 Thu Apr 30 20:04:33 2015 +++ src/doc/CHANGES-5.3 Fri May 22 11:05:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.114 2015/04/30 20:04:33 snj Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.115 2015/05/22 11:05:57 sborrill Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -3892,3 +3892,8 @@ sys/dev/pci/pcidevs_data.h regen - Fix debug message. [msaitoh, ticket #1962] +sys/arch/xen/xen/xenevt.c 1.42 + + Fix off by one error, addresses port-xen/49919. + [bouyer, ticket #1965] +
CVS commit: [netbsd-5] src/sys/arch/xen/xen
Module Name:src
Committed By: sborrill
Date: Fri May 22 11:04:28 UTC 2015
Modified Files:
src/sys/arch/xen/xen [netbsd-5]: xenevt.c
Log Message:
Pull up the following revisions(s) (requested by bouyer in ticket #1965):
sys/arch/xen/xen/xenevt.c: revision 1.42
Fix off by one error, addresses port-xen/49919.
To generate a diff of this commit:
cvs rdiff -u -r1.29.4.2 -r1.29.4.3 src/sys/arch/xen/xen/xenevt.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/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.29.4.2 src/sys/arch/xen/xen/xenevt.c:1.29.4.3
--- src/sys/arch/xen/xen/xenevt.c:1.29.4.2 Wed Sep 30 00:08:03 2009
+++ src/sys/arch/xen/xen/xenevt.c Fri May 22 11:04:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xenevt.c,v 1.29.4.2 2009/09/30 00:08:03 snj Exp $ */
+/* $NetBSD: xenevt.c,v 1.29.4.3 2015/05/22 11:04:28 sborrill Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.29.4.2 2009/09/30 00:08:03 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.29.4.3 2015/05/22 11:04:28 sborrill Exp $");
#include "opt_xen.h"
#include
@@ -496,7 +496,7 @@ xenevt_fwrite(struct file *fp, off_t *of
if (uio->uio_resid == 0)
return (0);
nentries = uio->uio_resid / sizeof(uint16_t);
- if (nentries > NR_EVENT_CHANNELS)
+ if (nentries >= NR_EVENT_CHANNELS)
return EMSGSIZE;
chans = kmem_alloc(nentries * sizeof(uint16_t), KM_SLEEP);
if (chans == NULL)
@@ -580,7 +580,7 @@ xenevt_fioctl(struct file *fp, u_long cm
{
struct ioctl_evtchn_unbind *unbind = addr;
- if (unbind->port > NR_EVENT_CHANNELS)
+ if (unbind->port >= NR_EVENT_CHANNELS)
return EINVAL;
if (devevent[unbind->port] != d)
return ENOTCONN;
@@ -596,7 +596,7 @@ xenevt_fioctl(struct file *fp, u_long cm
{
struct ioctl_evtchn_notify *notify = addr;
- if (notify->port > NR_EVENT_CHANNELS)
+ if (notify->port >= NR_EVENT_CHANNELS)
return EINVAL;
if (devevent[notify->port] != d)
return ENOTCONN;
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: bouyer
Date: Fri May 22 10:34:13 UTC 2015
Modified Files:
src/sys/arch/xen/xen: xenevt.c
Log Message:
Fix off by one error, pointed out by Wei Liu in port-xen/49919
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/xen/xen/xenevt.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/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.41 src/sys/arch/xen/xen/xenevt.c:1.42
--- src/sys/arch/xen/xen/xenevt.c:1.41 Fri Jul 25 08:10:35 2014
+++ src/sys/arch/xen/xen/xenevt.c Fri May 22 10:34:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xenevt.c,v 1.41 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: xenevt.c,v 1.42 2015/05/22 10:34:13 bouyer Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.41 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.42 2015/05/22 10:34:13 bouyer Exp $");
#include "opt_xen.h"
#include
@@ -489,7 +489,7 @@ xenevt_fwrite(struct file *fp, off_t *of
if (uio->uio_resid == 0)
return (0);
nentries = uio->uio_resid / sizeof(uint16_t);
- if (nentries > NR_EVENT_CHANNELS)
+ if (nentries >= NR_EVENT_CHANNELS)
return EMSGSIZE;
chans = kmem_alloc(nentries * sizeof(uint16_t), KM_SLEEP);
if (chans == NULL)
@@ -582,7 +582,7 @@ xenevt_fioctl(struct file *fp, u_long cm
{
struct ioctl_evtchn_unbind *unbind = addr;
- if (unbind->port > NR_EVENT_CHANNELS)
+ if (unbind->port >= NR_EVENT_CHANNELS)
return EINVAL;
mutex_enter(&devevent_lock);
if (devevent[unbind->port] != d) {
@@ -603,7 +603,7 @@ xenevt_fioctl(struct file *fp, u_long cm
{
struct ioctl_evtchn_notify *notify = addr;
- if (notify->port > NR_EVENT_CHANNELS)
+ if (notify->port >= NR_EVENT_CHANNELS)
return EINVAL;
mutex_enter(&devevent_lock);
if (devevent[notify->port] != d) {
CVS commit: src/sys/netinet
Module Name:src
Committed By: ozaki-r
Date: Fri May 22 07:44:46 UTC 2015
Modified Files:
src/sys/netinet: if_arp.c
Log Message:
Replace NARC with NARCNET to follow renaming at 2007
Hmm, is anyone using this?
To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/sys/netinet/if_arp.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/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.168 src/sys/netinet/if_arp.c:1.169
--- src/sys/netinet/if_arp.c:1.168 Thu May 21 09:29:51 2015
+++ src/sys/netinet/if_arp.c Fri May 22 07:44:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.168 2015/05/21 09:29:51 ozaki-r Exp $ */
+/* $NetBSD: if_arp.c,v 1.169 2015/05/22 07:44:46 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.168 2015/05/21 09:29:51 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.169 2015/05/22 07:44:46 ozaki-r Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -555,7 +555,7 @@ arp_rtrequest(int req, struct rtentry *r
rt->rt_rmx.rmx_mtu = FDDIIPMTU;
break;
#endif
-#if NARC > 0
+#if NARCNET > 0
case IFT_ARCNET:
{
int arcipifmtu;
@@ -603,7 +603,7 @@ arp_rtrequest(int req, struct rtentry *r
rt->rt_rmx.rmx_mtu = FDDIIPMTU;
break;
#endif
-#if NARC > 0
+#if NARCNET > 0
case IFT_ARCNET:
{
int arcipifmtu;
