CVS commit: xsrc/xfree/xc/programs/Xserver
Module Name:xsrc
Committed By: mrg
Date: Thu Dec 11 09:46:17 UTC 2014
Modified Files:
xsrc/xfree/xc/programs/Xserver/GL/glx: glxcmds.c glxcmdsswap.c
glxserver.h rensize.c single2.c single2swap.c singlepix.c
singlepixswap.c unpack.h
xsrc/xfree/xc/programs/Xserver/Xext: xcmisc.c xvdisp.c
xsrc/xfree/xc/programs/Xserver/Xi: chgdctl.c chgfctl.c sendexev.c
xsrc/xfree/xc/programs/Xserver/dbe: dbe.c
xsrc/xfree/xc/programs/Xserver/dix: dispatch.c
xsrc/xfree/xc/programs/Xserver/include: dix.h misc.h
xsrc/xfree/xc/programs/Xserver/os: access.c rpcauth.c
xsrc/xfree/xc/programs/Xserver/randr: randr.c
xsrc/xfree/xc/programs/Xserver/render: render.c
Log Message:
pull over from xorg-server, porting as necessary.
--
apply fixes for:
X.Org Security Advisory: Dec. 9, 2014
Protocol handling issues in X Window System servers
backported to 1.10.x by myself.
included are fixes for:
denial of service due to unchecked malloc in client authentication
CVE-2014-8091
integer overflows calculating memory needs for requests
CVE-2014-8092
CVE-2014-8093
CVE-2014-8094
out of bounds access due to not validating length or offset values in requests
CVE-2014-8095
CVE-2014-8096
CVE-2014-8097
CVE-2014-8098
CVE-2014-8099
CVE-2014-8100
CVE-2014-8101
CVE-2014-8102
CVE-2014-8103
--
apply two more parts of CVE-2014-8092:
Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5]
dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6]
--
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c \
xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c \
xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h \
xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c \
xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c \
xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h
cvs rdiff -u -r1.1.1.7 -r1.2 xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c
cvs rdiff -u -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c \
xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c \
xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c
cvs rdiff -u -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/dbe/dbe.c
cvs rdiff -u -r1.1.1.7 -r1.2 xsrc/xfree/xc/programs/Xserver/dix/dispatch.c
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/xfree/xc/programs/Xserver/include/dix.h \
xsrc/xfree/xc/programs/Xserver/include/misc.h
cvs rdiff -u -r1.6 -r1.7 xsrc/xfree/xc/programs/Xserver/os/access.c
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/xfree/xc/programs/Xserver/os/rpcauth.c
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/xfree/xc/programs/Xserver/randr/randr.c
cvs rdiff -u -r1.3 -r1.4 xsrc/xfree/xc/programs/Xserver/render/render.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c
diff -u xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c:1.1.1.6 xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c:1.2
--- xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c:1.1.1.6 Fri Mar 18 13:09:55 2005
+++ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c Thu Dec 11 09:46:16 2014
@@ -1427,7 +1427,7 @@ int __glXRender(__GLXclientState *cl, GL
left = (req-length 2) - sz_xGLXRenderReq;
while (left 0) {
__GLXrenderSizeData *entry;
-int extra;
+int extra = 0;
void (* proc)(GLbyte *);
/*
@@ -1464,22 +1464,19 @@ int __glXRender(__GLXclientState *cl, GL
client-errorValue = commandsDone;
return __glXBadRenderRequest;
}
+if (cmdlen entry-bytes) {
+return BadLength;
+}
if (entry-varsize) {
/* variable size command */
-extra = (*entry-varsize)(pc + __GLX_RENDER_HDR_SIZE, False);
+extra = (*entry-varsize)(pc + __GLX_RENDER_HDR_SIZE, False,
+ left - __GLX_RENDER_LARGE_HDR_SIZE);
if (extra 0) {
-extra = 0;
-}
-if (cmdlen != __GLX_PAD(entry-bytes + extra)) {
-return BadLength;
-}
-} else {
-/* constant size command */
-if (cmdlen != __GLX_PAD(entry-bytes)) {
return BadLength;
}
}
- if (left cmdlen) {
+
+if (cmdlen != safe_pad(safe_add(entry-bytes, extra))) {
return BadLength;
}
@@ -1513,6 +1510,8 @@ int __glXRenderLarge(__GLXclientState *c
int error;
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src Committed By: msaitoh Date: Thu Dec 11 10:07:45 UTC 2014 Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: Add newline if ci_tsc_freq is 0 to not to break the output. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 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.62 src/usr.sbin/cpuctl/arch/i386.c:1.63 --- src/usr.sbin/cpuctl/arch/i386.c:1.62 Thu Nov 20 10:31:10 2014 +++ src/usr.sbin/cpuctl/arch/i386.c Thu Dec 11 10:07:45 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: i386.c,v 1.62 2014/11/20 10:31:10 msaitoh Exp $ */ +/* $NetBSD: i386.c,v 1.63 2014/12/11 10:07:45 msaitoh Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: i386.c,v 1.62 2014/11/20 10:31:10 msaitoh Exp $); +__RCSID($NetBSD: i386.c,v 1.63 2014/12/11 10:07:45 msaitoh Exp $); #endif /* not lint */ #include sys/types.h @@ -1836,9 +1836,10 @@ identifycpu(int fd, const char *cpuname) aprint_normal( (%s-class), classnames[class]); if (ci-ci_tsc_freq != 0) - aprint_normal(, %ju.%02ju MHz\n, + aprint_normal(, %ju.%02ju MHz, ((uintmax_t)ci-ci_tsc_freq + 4999) / 100, (((uintmax_t)ci-ci_tsc_freq + 4999) / 1) % 100); + aprint_normal(\n); aprint_normal_dev(ci-ci_dev, family %#x model %#x stepping %#x, ci-ci_family, ci-ci_model, CPUID_TO_STEPPING(ci-ci_signature));
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src Committed By: msaitoh Date: Thu Dec 11 12:21:44 UTC 2014 Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: Don't print the microcode version if the ioctl failed to not to print garbage. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 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.63 src/usr.sbin/cpuctl/arch/i386.c:1.64 --- src/usr.sbin/cpuctl/arch/i386.c:1.63 Thu Dec 11 10:07:45 2014 +++ src/usr.sbin/cpuctl/arch/i386.c Thu Dec 11 12:21:44 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: i386.c,v 1.63 2014/12/11 10:07:45 msaitoh Exp $ */ +/* $NetBSD: i386.c,v 1.64 2014/12/11 12:21:44 msaitoh Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: i386.c,v 1.63 2014/12/11 10:07:45 msaitoh Exp $); +__RCSID($NetBSD: i386.c,v 1.64 2014/12/11 12:21:44 msaitoh Exp $); #endif /* not lint */ #include sys/types.h @@ -1995,6 +1995,8 @@ identifycpu(int fd, const char *cpuname) ucode_64.loader_version = ucode.loader_version; if (ioctl(fd, IOC_CPU_UCODE_GET_VERSION_64, ucode_64) 0) return; +#else + return; #endif }
CVS commit: [netbsd-7] xsrc/xfree/xc/programs/Xserver
Module Name:xsrc Committed By: martin Date: Thu Dec 11 13:33:15 UTC 2014 Modified Files: xsrc/xfree/xc/programs/Xserver/GL/glx [netbsd-7]: glxcmds.c glxcmdsswap.c glxserver.h rensize.c single2.c single2swap.c singlepix.c singlepixswap.c unpack.h xsrc/xfree/xc/programs/Xserver/Xext [netbsd-7]: xcmisc.c xvdisp.c xsrc/xfree/xc/programs/Xserver/Xi [netbsd-7]: chgdctl.c chgfctl.c sendexev.c xsrc/xfree/xc/programs/Xserver/dbe [netbsd-7]: dbe.c xsrc/xfree/xc/programs/Xserver/dix [netbsd-7]: dispatch.c xsrc/xfree/xc/programs/Xserver/include [netbsd-7]: dix.h misc.h xsrc/xfree/xc/programs/Xserver/os [netbsd-7]: access.c rpcauth.c xsrc/xfree/xc/programs/Xserver/randr [netbsd-7]: randr.c xsrc/xfree/xc/programs/Xserver/render [netbsd-7]: render.c Log Message: Pull up following revision(s) (requested by mrg in ticket #308): xfree/xc/programs/Xserver/dix/dispatch.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xvdisp.c: revision 1.2 xfree/xc/programs/Xserver/include/misc.h: revision 1.2 xfree/xc/programs/Xserver/render/render.c: revision 1.4 xfree/xc/programs/Xserver/GL/glx/singlepixswap.c: revision 1.2 xfree/xc/programs/Xserver/Xi/sendexev.c: revision 1.2 xfree/xc/programs/Xserver/include/dix.h: revision 1.2 xfree/xc/programs/Xserver/os/access.c: revision 1.7 xfree/xc/programs/Xserver/GL/glx/glxserver.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/rensize.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/unpack.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/singlepix.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgfctl.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgdctl.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmds.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xcmisc.c: revision 1.3 xfree/xc/programs/Xserver/randr/randr.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c: revision 1.2 xfree/xc/programs/Xserver/os/rpcauth.c: revision 1.2 xfree/xc/programs/Xserver/dbe/dbe.c: revision 1.3 xfree/xc/programs/Xserver/GL/glx/single2.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/single2swap.c: revision 1.2 pull over from xorg-server, porting as necessary. - -- apply fixes for: X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers backported to 1.10.x by myself. included are fixes for: denial of service due to unchecked malloc in client authentication CVE-2014-8091 integer overflows calculating memory needs for requests CVE-2014-8092 CVE-2014-8093 CVE-2014-8094 out of bounds access due to not validating length or offset values in requests CVE-2014-8095 CVE-2014-8096 CVE-2014-8097 CVE-2014-8098 CVE-2014-8099 CVE-2014-8100 CVE-2014-8101 CVE-2014-8102 CVE-2014-8103 - -- apply two more parts of CVE-2014-8092: Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5] dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6] - -- To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.1.1.6.24.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h cvs rdiff -u -r1.1.1.7 -r1.1.1.7.24.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.38.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.38.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c cvs rdiff -u -r1.2 -r1.2.18.1 xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.36.1 \ xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.38.1 \ xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c cvs rdiff -u -r1.2 -r1.2.18.1 xsrc/xfree/xc/programs/Xserver/dbe/dbe.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.24.1 \ xsrc/xfree/xc/programs/Xserver/dix/dispatch.c cvs rdiff -u -r1.1.1.6 -r1.1.1.6.36.1 \ xsrc/xfree/xc/programs/Xserver/include/dix.h cvs rdiff -u -r1.1.1.6 -r1.1.1.6.24.1 \ xsrc/xfree/xc/programs/Xserver/include/misc.h cvs rdiff -u -r1.6 -r1.6.24.1 xsrc/xfree/xc/programs/Xserver/os/access.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.36.1 \ xsrc/xfree/xc/programs/Xserver/os/rpcauth.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.36.1 \ xsrc/xfree/xc/programs/Xserver/randr/randr.c cvs rdiff -u -r1.3 -r1.3.18.1 xsrc/xfree/xc/programs/Xserver/render/render.c Please note that diffs are not
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Dec 11 13:38:01 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Update #308 for additional xfree pullups To generate a diff of this commit: cvs rdiff -u -r1.1.2.126 -r1.1.2.127 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.126 src/doc/CHANGES-7.0:1.1.2.127 --- src/doc/CHANGES-7.0:1.1.2.126 Wed Dec 10 17:37:26 2014 +++ src/doc/CHANGES-7.0 Thu Dec 11 13:38:01 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.126 2014/12/10 17:37:26 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.127 2014/12/11 13:38:01 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -3330,6 +3330,28 @@ xsrc/external/mit/xorg-server/dist/test/ xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c patch xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c patch xsrc/external/mit/xorg-server/dist/xfixes/select.c patch +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h 1.2 +xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c 1.3 +xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c 1.2 +xsrc/xfree/xc/programs/Xserver/dbe/dbe.c 1.3 +xsrc/xfree/xc/programs/Xserver/dix/dispatch.c 1.2 +xsrc/xfree/xc/programs/Xserver/include/dix.h 1.2 +xsrc/xfree/xc/programs/Xserver/include/misc.h 1.2 +xsrc/xfree/xc/programs/Xserver/os/access.c 1.7 +xsrc/xfree/xc/programs/Xserver/os/rpcauth.c 1.2 +xsrc/xfree/xc/programs/Xserver/randr/randr.c 1.2 +xsrc/xfree/xc/programs/Xserver/render/render.c 1.4 apply fixes for X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers
CVS commit: src/sys/net
Module Name:src
Committed By: martin
Date: Thu Dec 11 14:33:22 UTC 2014
Modified Files:
src/sys/net: if.c
Log Message:
Avoid scheduling more slow timeouts while we are in the process of detaching
the interface: set if_slowtimo to NULL before doing the callout_halt()
and test for that in the callout. Fixes PR kern/49462.
To generate a diff of this commit:
cvs rdiff -u -r1.304 -r1.305 src/sys/net/if.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/if.c
diff -u src/sys/net/if.c:1.304 src/sys/net/if.c:1.305
--- src/sys/net/if.c:1.304 Mon Dec 8 04:55:47 2014
+++ src/sys/net/if.c Thu Dec 11 14:33:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.304 2014/12/08 04:55:47 ozaki-r Exp $ */
+/* $NetBSD: if.c,v 1.305 2014/12/11 14:33:22 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if.c,v 1.304 2014/12/08 04:55:47 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: if.c,v 1.305 2014/12/11 14:33:22 martin Exp $);
#include opt_inet.h
@@ -745,6 +745,7 @@ if_detach(struct ifnet *ifp)
s = splnet();
if (ifp-if_slowtimo != NULL) {
+ ifp-if_slowtimo = NULL;
callout_halt(ifp-if_slowtimo_ch, NULL);
callout_destroy(ifp-if_slowtimo_ch);
kmem_free(ifp-if_slowtimo_ch, sizeof(*ifp-if_slowtimo_ch));
@@ -1515,15 +1516,19 @@ static void
if_slowtimo(void *arg)
{
struct ifnet *ifp = arg;
- int s = splnet();
+ int s;
- KASSERT(ifp-if_slowtimo != NULL);
+ if (__predict_false(ifp-if_slowtimo == NULL))
+ return;
+ s = splnet();
if (ifp-if_timer != 0 --ifp-if_timer == 0)
(*ifp-if_slowtimo)(ifp);
splx(s);
- callout_schedule(ifp-if_slowtimo_ch, hz / IFNET_SLOWHZ);
+
+ if (__predict_true(ifp-if_slowtimo != NULL))
+ callout_schedule(ifp-if_slowtimo_ch, hz / IFNET_SLOWHZ);
}
/*
CVS commit: src/lib/libc/hash/sha2
Module Name:src Committed By: riastradh Date: Thu Dec 11 21:54:13 UTC 2014 Modified Files: src/lib/libc/hash/sha2: sha224hl.c Log Message: Fix rcsid comment. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/hash/sha2/sha224hl.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/hash/sha2/sha224hl.c diff -u src/lib/libc/hash/sha2/sha224hl.c:1.1 src/lib/libc/hash/sha2/sha224hl.c:1.2 --- src/lib/libc/hash/sha2/sha224hl.c:1.1 Tue May 26 08:04:12 2009 +++ src/lib/libc/hash/sha2/sha224hl.c Thu Dec 11 21:54:13 2014 @@ -1,4 +1,4 @@ -/* $NetBSD */ +/* $NetBSD: sha224hl.c,v 1.2 2014/12/11 21:54:13 riastradh Exp $ */ /* * Derived from code written by Jason R. Thorpe thor...@netbsd.org, @@ -7,7 +7,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: sha224hl.c,v 1.1 2009/05/26 08:04:12 joerg Exp $); +__RCSID($NetBSD: sha224hl.c,v 1.2 2014/12/11 21:54:13 riastradh Exp $); #define HASH_ALGORITHM SHA224 #define HASH_FNPREFIX SHA224_
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: riastradh Date: Thu Dec 11 22:14:13 UTC 2014 Modified Files: src/distrib/sets/lists/debug: md.amd64 shl.mi src/distrib/sets/lists/modules: md.amd64 Log Message: Fix some tags on set lists related to zfs, solaris, lvm, mdns, xen. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/modules/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/md.amd64 diff -u src/distrib/sets/lists/debug/md.amd64:1.74 src/distrib/sets/lists/debug/md.amd64:1.75 --- src/distrib/sets/lists/debug/md.amd64:1.74 Wed Dec 10 13:34:41 2014 +++ src/distrib/sets/lists/debug/md.amd64 Thu Dec 11 22:14:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.74 2014/12/10 13:34:41 christos Exp $ +# $NetBSD: md.amd64,v 1.75 2014/12/11 22:14:13 riastradh Exp $ ./usr/lib/i386/i18n/libBIG5_g.a comp-c-debuglib compat,debuglib ./usr/lib/i386/i18n/libDECHanyu_g.a comp-c-debuglib compat,debuglib ./usr/lib/i386/i18n/libEUCTW_g.a comp-c-debuglib compat,debuglib @@ -213,7 +213,7 @@ ./usr/libdata/debug/usr/lib/i386/libdevmapper.so.1.0.debug comp-compat-shlib compat,pic,lvm,debug ./usr/libdata/debug/usr/lib/i386/libdm.so.0.0.debug comp-compat-shlib compat,pic,debug,obsolete ./usr/libdata/debug/usr/lib/i386/libdns.so.8.1.debug comp-compat-shlib compat,pic,debug -./usr/libdata/debug/usr/lib/i386/libdns_sd.so.0.0.debug comp-compat-shlib compat,pic,debug +./usr/libdata/debug/usr/lib/i386/libdns_sd.so.0.0.debug comp-compat-shlib compat,pic,debug,mdns ./usr/libdata/debug/usr/lib/i386/libdwarf.so.1.0.debug comp-compat-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/i386/libedit.so.3.1.debug comp-compat-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/i386/libelf.so.1.0.debug comp-compat-shlib compat,pic,debug Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.87 src/distrib/sets/lists/debug/shl.mi:1.88 --- src/distrib/sets/lists/debug/shl.mi:1.87 Wed Dec 10 13:34:41 2014 +++ src/distrib/sets/lists/debug/shl.mi Thu Dec 11 22:14:13 2014 @@ -1,8 +1,8 @@ -# $NetBSD: shl.mi,v 1.87 2014/12/10 13:34:41 christos Exp $ +# $NetBSD: shl.mi,v 1.88 2014/12/11 22:14:13 riastradh Exp $ ./usr/libdata/debug/lib/libc.so.12.196.debug comp-sys-debug debug ./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug ./usr/libdata/debug/lib/libcrypto.so.8.3.debug comp-sys-debug debug -./usr/libdata/debug/lib/libdevmapper.so.1.0.debug comp-sys-debug debug +./usr/libdata/debug/lib/libdevmapper.so.1.0.debug comp-sys-debug lvm,debug ./usr/libdata/debug/lib/libdm.so.0.0.debug comp-sys-debug debug,obsolete ./usr/libdata/debug/lib/libedit.so.3.1.debug comp-sys-debug debug ./usr/libdata/debug/lib/libevent.so.4.0.debug comp-sys-debug debug Index: src/distrib/sets/lists/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.49 src/distrib/sets/lists/modules/md.amd64:1.50 --- src/distrib/sets/lists/modules/md.amd64:1.49 Sun Nov 16 18:33:19 2014 +++ src/distrib/sets/lists/modules/md.amd64 Thu Dec 11 22:14:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.49 2014/11/16 18:33:19 riastradh Exp $ +# $NetBSD: md.amd64,v 1.50 2014/12/11 22:14:13 riastradh Exp $ # # NOTE that there are two sets of files here: # @MODULEDIR@ and amd64-xen @@ -256,8 +256,8 @@ ./stand/amd64-xen/@OSRELEASE@/modules/des/des.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/dk_subrbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/dk_subr/dk_subr.kmod base-kernel-modules kmod,compatmodules -./stand/amd64-xen/@OSRELEASE@/modules/dmbase-kernel-modules kmod,compatmodules -./stand/amd64-xen/@OSRELEASE@/modules/dm/dm.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/dmbase-kernel-modules kmod,compatmodules,lvm +./stand/amd64-xen/@OSRELEASE@/modules/dm/dm.kmod base-kernel-modules kmod,compatmodules,lvm ./stand/amd64-xen/@OSRELEASE@/modules/drmbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/drm/drm.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/drmkmsbase-kernel-modules kmod,compatmodules @@ -466,8 +466,8 @@ ./stand/amd64-xen/@OSRELEASE@/modules/sljit/sljit.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/smbfsbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/smbfs/smbfs.kmod base-kernel-modules kmod,compatmodules -./stand/amd64-xen/@OSRELEASE@/modules/solarisbase-kernel-modules kmod,compatmodules -./stand/amd64-xen/@OSRELEASE@/modules/solaris/solaris.kmod base-kernel-modules kmod,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/solaris
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: riastradh Date: Thu Dec 11 23:24:12 UTC 2014 Modified Files: src/distrib/sets/lists/base: mi Log Message: Fix MKNLS=no build by untagging unconditional empty directories. XXX May merit investigating why these are made when MKNLS=no, but they don't seem to hurt. To generate a diff of this commit: cvs rdiff -u -r1.1091 -r1.1092 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1091 src/distrib/sets/lists/base/mi:1.1092 --- src/distrib/sets/lists/base/mi:1.1091 Thu Oct 30 13:05:58 2014 +++ src/distrib/sets/lists/base/mi Thu Dec 11 23:24:12 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1091 2014/10/30 13:05:58 nonaka Exp $ +# $NetBSD: mi,v 1.1092 2014/12/11 23:24:12 riastradh Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -2831,7 +2831,7 @@ ./usr/share/locale/af_ZA.ISO8859-15/LC_TIME base-locale-af nls ./usr/share/locale/af_ZA.UTF-8 base-locale-af ./usr/share/locale/af_ZA.UTF-8/LC_CTYPE base-locale-af nls -./usr/share/locale/af_ZA.UTF-8/LC_MESSAGES base-locale-af nls +./usr/share/locale/af_ZA.UTF-8/LC_MESSAGES base-locale-af ./usr/share/locale/af_ZA.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES base-locale-af nls ./usr/share/locale/af_ZA.UTF-8/LC_MONETARY base-locale-af nls ./usr/share/locale/af_ZA.UTF-8/LC_NUMERIC base-locale-af nls @@ -2854,7 +2854,7 @@ ./usr/share/locale/be_BY.ISO8859-5/LC_TIME base-locale-be nls ./usr/share/locale/be_BY.UTF-8 base-locale-be ./usr/share/locale/be_BY.UTF-8/LC_CTYPE base-locale-be nls -./usr/share/locale/be_BY.UTF-8/LC_MESSAGES base-locale-be nls +./usr/share/locale/be_BY.UTF-8/LC_MESSAGES base-locale-be ./usr/share/locale/be_BY.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES base-locale-be nls ./usr/share/locale/be_BY.UTF-8/LC_MONETARY base-locale-be nls ./usr/share/locale/be_BY.UTF-8/LC_NUMERIC base-locale-be nls @@ -2868,7 +2868,7 @@ ./usr/share/locale/bg_BG.CP1251/LC_TIME base-locale-bg nls ./usr/share/locale/bg_BG.UTF-8 base-locale-bg ./usr/share/locale/bg_BG.UTF-8/LC_CTYPE base-locale-bg nls -./usr/share/locale/bg_BG.UTF-8/LC_MESSAGES base-locale-bg nls +./usr/share/locale/bg_BG.UTF-8/LC_MESSAGES base-locale-bg ./usr/share/locale/bg_BG.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES base-locale-bg nls ./usr/share/locale/bg_BG.UTF-8/LC_MONETARY base-locale-bg nls ./usr/share/locale/bg_BG.UTF-8/LC_NUMERIC base-locale-bg nls @@ -2891,7 +2891,7 @@ ./usr/share/locale/ca_ES.ISO8859-15/LC_TIME base-locale-ca nls ./usr/share/locale/ca_ES.UTF-8 base-locale-ca ./usr/share/locale/ca_ES.UTF-8/LC_CTYPE base-locale-ca nls -./usr/share/locale/ca_ES.UTF-8/LC_MESSAGES base-locale-ca nls +./usr/share/locale/ca_ES.UTF-8/LC_MESSAGES base-locale-ca ./usr/share/locale/ca_ES.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES base-locale-ca nls ./usr/share/locale/ca_ES.UTF-8/LC_MONETARY base-locale-ca nls ./usr/share/locale/ca_ES.UTF-8/LC_NUMERIC base-locale-ca nls @@ -2911,7 +2911,7 @@ ./usr/share/locale/cs_CZ.ISO8859-2/LC_TIME base-locale-cs nls ./usr/share/locale/cs_CZ.UTF-8 base-locale-cs ./usr/share/locale/cs_CZ.UTF-8/LC_CTYPE base-locale-cs nls -./usr/share/locale/cs_CZ.UTF-8/LC_MESSAGES base-locale-cs nls +./usr/share/locale/cs_CZ.UTF-8/LC_MESSAGES base-locale-cs ./usr/share/locale/cs_CZ.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES base-locale-cs nls ./usr/share/locale/cs_CZ.UTF-8/LC_MONETARY base-locale-cs nls ./usr/share/locale/cs_CZ.UTF-8/LC_NUMERIC base-locale-cs nls @@ -2936,7 +2936,7 @@ ./usr/share/locale/da_DK.ISO8859-15/LC_TIME base-locale-da nls ./usr/share/locale/da_DK.UTF-8 base-locale-da ./usr/share/locale/da_DK.UTF-8/LC_CTYPE base-locale-da nls -./usr/share/locale/da_DK.UTF-8/LC_MESSAGES base-locale-da nls +./usr/share/locale/da_DK.UTF-8/LC_MESSAGES base-locale-da ./usr/share/locale/da_DK.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES base-locale-da nls ./usr/share/locale/da_DK.UTF-8/LC_MONETARY base-locale-da nls ./usr/share/locale/da_DK.UTF-8/LC_NUMERIC base-locale-da nls @@ -2964,7 +2964,7 @@ ./usr/share/locale/de_AT.ISO8859-15/LC_TIME base-locale-de nls ./usr/share/locale/de_AT.UTF-8 base-locale-de ./usr/share/locale/de_AT.UTF-8/LC_CTYPE base-locale-de nls -./usr/share/locale/de_AT.UTF-8/LC_MESSAGES base-locale-de nls +./usr/share/locale/de_AT.UTF-8/LC_MESSAGES base-locale-de ./usr/share/locale/de_AT.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES base-locale-de nls ./usr/share/locale/de_AT.UTF-8/LC_MONETARY base-locale-de nls ./usr/share/locale/de_AT.UTF-8/LC_NUMERIC base-locale-de nls @@ -2987,7 +2987,7 @@ ./usr/share/locale/de_CH.ISO8859-15/LC_TIME base-locale-de nls ./usr/share/locale/de_CH.UTF-8 base-locale-de ./usr/share/locale/de_CH.UTF-8/LC_CTYPE base-locale-de nls -./usr/share/locale/de_CH.UTF-8/LC_MESSAGES base-locale-de
CVS commit: src/sys/arch
Module Name:src
Committed By: jmcneill
Date: Thu Dec 11 23:35:11 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_reg.h
src/sys/arch/evbarm/awin: awin_machdep.c awin_start.S platform.h
Log Message:
A80: Startup 3 additional Cortex-A7 cores in cluster 0.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/arm/allwinner/awin_reg.h
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/awin/awin_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/awin/awin_start.S
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/awin/platform.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/arm/allwinner/awin_reg.h
diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.72 src/sys/arch/arm/allwinner/awin_reg.h:1.73
--- src/sys/arch/arm/allwinner/awin_reg.h:1.72 Mon Dec 8 10:48:22 2014
+++ src/sys/arch/arm/allwinner/awin_reg.h Thu Dec 11 23:35:11 2014
@@ -54,6 +54,8 @@
#define AWIN_CORE_PBASE 0x01C0
#if defined(ALLWINNER_A80)
#define AWIN_CORE_SIZE 0x0640 /* XXX */
+#define AWIN_A80_RCPUCFG_PBASE 0x0170
+#define AWIN_A80_RCPUCFG_SIZE 0x0010
#define AWIN_A80_CORE2_PBASE 0x0080
#define AWIN_A80_CORE2_SIZE 0x0010
#define AWIN_A80_USB_PBASE 0x00a0
@@ -2821,9 +2823,26 @@ struct awin_a31_dma_desc {
#define AWIN_A80_RPRCM_CIR_CLK_REG 0x0054
#define AWIN_A80_RPRCM_APB0_RST_REG 0x00b0
+#define AWIN_A80_RPRCM_CLUSTER0_RST_REG 0x0004
+
+#define AWIN_A80_RPRCM_CLUSTER0_RST_REG 0x0004
+#define AWIN_A80_RPRCM_CLUSTER1_RST_REG 0x0008
+
+#define AWIN_A80_RPRCM_CLUSTER0_PWR_GATING_REG 0x0100
+#define AWIN_A80_RPRCM_CLUSTER1_PWR_GATING_REG 0x0104
+
+#define AWIN_A80_RPRCM_CLUSTER0_PRW_CLAMP_REG 0x0140
+
+#define AWIN_A80_RPRCM_CLUSTER0_PRW_CLAMP_STATUS_REG 0x0064
+
+#define AWIN_A80_RPRCM_PRIVATE_REG 0x0164
+
#define AWIN_A80_RPRCM_APB0_GATING_CIR __BIT(1)
#define AWIN_A80_RPRCM_APB0_RST_CIR __BIT(1)
+#define AWIN_A80_RCPUCFG_CLUSTER0_RST_REG 0x0080
+#define AWIN_A80_RCPUCFG_CLUSTER1_RST_REG 0x0084
+
#define AWIN_A80_RSB_CMD_REG 0x002c
#define AWIN_A80_RSB_DAR_REG 0x0030
Index: src/sys/arch/evbarm/awin/awin_machdep.c
diff -u src/sys/arch/evbarm/awin/awin_machdep.c:1.35 src/sys/arch/evbarm/awin/awin_machdep.c:1.36
--- src/sys/arch/evbarm/awin/awin_machdep.c:1.35 Wed Dec 10 17:45:53 2014
+++ src/sys/arch/evbarm/awin/awin_machdep.c Thu Dec 11 23:35:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_machdep.c,v 1.35 2014/12/10 17:45:53 jmcneill Exp $ */
+/* $NetBSD: awin_machdep.c,v 1.36 2014/12/11 23:35:11 jmcneill Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.35 2014/12/10 17:45:53 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.36 2014/12/11 23:35:11 jmcneill Exp $);
#include opt_machdep.h
#include opt_ddb.h
@@ -318,6 +318,16 @@ static const struct pmap_devmap devmap[]
.pd_prot = VM_PROT_READ|VM_PROT_WRITE,
.pd_cache = PTE_NOCACHE
},
+ {
+ /*
+ * A80 CPUCFG
+ */
+ .pd_va = _A(AWIN_A80_RCPUCFG_VBASE),
+ .pd_pa = _A(AWIN_A80_RCPUCFG_PBASE),
+ .pd_size = _S(AWIN_A80_RCPUCFG_SIZE),
+ .pd_prot = VM_PROT_READ|VM_PROT_WRITE,
+ .pd_cache = PTE_NOCACHE
+ },
#endif
{
/*
Index: src/sys/arch/evbarm/awin/awin_start.S
diff -u src/sys/arch/evbarm/awin/awin_start.S:1.7 src/sys/arch/evbarm/awin/awin_start.S:1.8
--- src/sys/arch/evbarm/awin/awin_start.S:1.7 Sun Dec 7 18:32:13 2014
+++ src/sys/arch/evbarm/awin/awin_start.S Thu Dec 11 23:35:11 2014
@@ -41,7 +41,7 @@
#include arm/allwinner/awin_reg.h
#include evbarm/awin/platform.h
-RCSID($NetBSD: awin_start.S,v 1.7 2014/12/07 18:32:13 jmcneill Exp $)
+RCSID($NetBSD: awin_start.S,v 1.8 2014/12/11 23:35:11 jmcneill Exp $)
#if defined(VERBOSE_INIT_ARM)
#define XPUTC(n) mov r0, n; bl xputc
@@ -151,7 +151,7 @@ _C_LABEL(awin_start):
// Make sure the cache is flushed out to RAM for the other CPUs
bl _C_LABEL(armv7_dcache_wbinv_all)
-#if defined(ALLWINNER_A20) + defined(ALLWINNER_A31) + defined(ALLWINNER_A80) 1
+#if defined(ALLWINNER_A20) + defined(ALLWINNER_A31) 1
// Read SoC ID
movw r5, #:lower16:(AWIN_CORE_PBASE+AWIN_SRAM_OFFSET)
movt r5, #:upper16:(AWIN_CORE_PBASE+AWIN_SRAM_OFFSET)
@@ -168,11 +168,10 @@ _C_LABEL(awin_start):
rev r1, r1
#endif
lsr r1, r1, #16
-#endif /* ALLWINNER_A20 + ALLWINNER_A31 + ALLWINNER_A80 1 */
// MP init based on SoC ID
#if defined(ALLWINNER_A20)
-# if defined(ALLWINNER_A31) || defined(ALLWINNER_A80)
+# if defined(ALLWINNER_A31)
movw r0, #AWIN_SRAM_VER_KEY_A20
cmp r1, r0
bleq a20_mpinit
@@ -181,7 +180,7 @@ _C_LABEL(awin_start):
# endif
#endif
#if defined(ALLWINNER_A31)
-# if defined(ALLWINNER_A20) || defined(ALLWINNER_A80)
+# if defined(ALLWINNER_A20)
movw r0, #AWIN_SRAM_VER_KEY_A31
cmp r1, r0
bleq a31_mpinit
@@ -189,6 +188,9 @@ _C_LABEL(awin_start):
bl
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Thu Dec 11 23:35:31 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: ALLWINNER_A80 Log Message: enable MULTIPROCESSOR To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/ALLWINNER_A80 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/ALLWINNER_A80 diff -u src/sys/arch/evbarm/conf/ALLWINNER_A80:1.12 src/sys/arch/evbarm/conf/ALLWINNER_A80:1.13 --- src/sys/arch/evbarm/conf/ALLWINNER_A80:1.12 Sun Dec 7 20:10:08 2014 +++ src/sys/arch/evbarm/conf/ALLWINNER_A80 Thu Dec 11 23:35:31 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ALLWINNER_A80,v 1.12 2014/12/07 20:10:08 jmcneill Exp $ +# $NetBSD: ALLWINNER_A80,v 1.13 2014/12/11 23:35:31 jmcneill Exp $ # # ALLWINNER_A80 - Allwinner A80 boards (Cubieboard4, OptimusBoard, etc) # @@ -180,7 +180,7 @@ config netbsd root on ? type ? mainbus0 at root # CPU -#options MULTIPROCESSOR +options MULTIPROCESSOR cpu* at mainbus? # Specify the memory size in megabytes.
CVS commit: [netbsd-7] src/distrib/sets/lists/debug
Module Name:src Committed By: htodd Date: Thu Dec 11 23:44:13 UTC 2014 Modified Files: src/distrib/sets/lists/debug [netbsd-7]: shl.mi Log Message: Fix debug build. To generate a diff of this commit: cvs rdiff -u -r1.71.2.2 -r1.71.2.3 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.71.2.2 src/distrib/sets/lists/debug/shl.mi:1.71.2.3 --- src/distrib/sets/lists/debug/shl.mi:1.71.2.2 Tue Dec 9 20:21:05 2014 +++ src/distrib/sets/lists/debug/shl.mi Thu Dec 11 23:44:13 2014 @@ -1,9 +1,9 @@ -# $NetBSD: shl.mi,v 1.71.2.2 2014/12/09 20:21:05 martin Exp $ +# $NetBSD: shl.mi,v 1.71.2.3 2014/12/11 23:44:13 htodd Exp $ ./usr/libdata/debug/lib/libc.so.12.193.debug comp-sys-debug debug ./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug ./usr/libdata/debug/lib/libcrypto.so.8.3.debug comp-sys-debug debug ./usr/libdata/debug/lib/libdevmapper.so.1.0.debug comp-sys-debug debug -./usr/libdata/debug/lib/libdm.so.0.0.debug comp-sys-debug debug +./usr/libdata/debug/lib/libdm.so.0.0.debug comp-sys-debug debug,obsolete ./usr/libdata/debug/lib/libedit.so.3.1.debug comp-sys-debug debug ./usr/libdata/debug/lib/libevent.so.4.0.debug comp-sys-debug debug ./usr/libdata/debug/lib/libgcc_s.so.1.0.debug comp-sys-debug gcc,debug
CVS commit: [netbsd-7] src/distrib/sets/lists/debug
Module Name:src Committed By: htodd Date: Thu Dec 11 23:53:35 UTC 2014 Modified Files: src/distrib/sets/lists/debug [netbsd-7]: shl.mi Log Message: Wrong tree - reverting. To generate a diff of this commit: cvs rdiff -u -r1.71.2.3 -r1.71.2.4 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.71.2.3 src/distrib/sets/lists/debug/shl.mi:1.71.2.4 --- src/distrib/sets/lists/debug/shl.mi:1.71.2.3 Thu Dec 11 23:44:13 2014 +++ src/distrib/sets/lists/debug/shl.mi Thu Dec 11 23:53:34 2014 @@ -1,9 +1,9 @@ -# $NetBSD: shl.mi,v 1.71.2.3 2014/12/11 23:44:13 htodd Exp $ +# $NetBSD: shl.mi,v 1.71.2.4 2014/12/11 23:53:34 htodd Exp $ ./usr/libdata/debug/lib/libc.so.12.193.debug comp-sys-debug debug ./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug ./usr/libdata/debug/lib/libcrypto.so.8.3.debug comp-sys-debug debug ./usr/libdata/debug/lib/libdevmapper.so.1.0.debug comp-sys-debug debug -./usr/libdata/debug/lib/libdm.so.0.0.debug comp-sys-debug debug,obsolete +./usr/libdata/debug/lib/libdm.so.0.0.debug comp-sys-debug debug ./usr/libdata/debug/lib/libedit.so.3.1.debug comp-sys-debug debug ./usr/libdata/debug/lib/libevent.so.4.0.debug comp-sys-debug debug ./usr/libdata/debug/lib/libgcc_s.so.1.0.debug comp-sys-debug gcc,debug
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Fri Dec 12 01:13:40 UTC 2014 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add options to run a.out i386 binaries (commented out) To generate a diff of this commit: cvs rdiff -u -r1.404 -r1.405 src/sys/arch/amd64/conf/GENERIC 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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.404 src/sys/arch/amd64/conf/GENERIC:1.405 --- src/sys/arch/amd64/conf/GENERIC:1.404 Sun Nov 16 11:01:40 2014 +++ src/sys/arch/amd64/conf/GENERIC Thu Dec 11 20:13:40 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.404 2014/11/16 16:01:40 manu Exp $ +# $NetBSD: GENERIC,v 1.405 2014/12/12 01:13:40 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.404 $ +#ident GENERIC-$Revision: 1.405 $ maxusers 64 # estimated number of users @@ -129,6 +129,16 @@ options COMPAT_LINUX32 # req. COMPAT_LI options EXEC_ELF32 options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +# The following options are for running i386 binaries for pre-1.6 +#options EXEC_AOUT +#options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI +#options COMPAT_09 # NetBSD 0.9, +#options COMPAT_10 # NetBSD 1.0, +#options COMPAT_11 # NetBSD 1.1, +#options COMPAT_12 # NetBSD 1.2 (and 386BSD and BSDI), +#options COMPAT_13 # NetBSD 1.3 (and 386BSD and BSDI), +#options COMPAT_14 # NetBSD 1.4, + # Wedge support options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
CVS commit: src/sys/arch/x86
Module Name:src
Committed By: msaitoh
Date: Fri Dec 12 02:25:55 UTC 2014
Modified Files:
src/sys/arch/x86/include: specialreg.h
src/sys/arch/x86/x86: cpu_ucode_intel.c
Log Message:
Use specialreg.h's definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/x86/cpu_ucode_intel.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/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.80 src/sys/arch/x86/include/specialreg.h:1.81
--- src/sys/arch/x86/include/specialreg.h:1.80 Thu Sep 11 18:11:59 2014
+++ src/sys/arch/x86/include/specialreg.h Fri Dec 12 02:25:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.80 2014/09/11 18:11:59 msaitoh Exp $ */
+/* $NetBSD: specialreg.h,v 1.81 2014/12/12 02:25:55 msaitoh Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -506,6 +506,7 @@
#define MSR_CESR 0x011 /* P5 only (trap on P6) */
#define MSR_CTR0 0x012 /* P5 only (trap on P6) */
#define MSR_CTR1 0x013 /* P5 only (trap on P6) */
+#define MSR_IA32_PLATFORM_ID 0x017
#define MSR_APICBASE 0x01b
#define MSR_EBL_CR_POWERON 0x02a
#define MSR_EBC_FREQUENCY_ID 0x02c /* PIV only */
Index: src/sys/arch/x86/x86/cpu_ucode_intel.c
diff -u src/sys/arch/x86/x86/cpu_ucode_intel.c:1.5 src/sys/arch/x86/x86/cpu_ucode_intel.c:1.6
--- src/sys/arch/x86/x86/cpu_ucode_intel.c:1.5 Wed Mar 26 08:04:19 2014
+++ src/sys/arch/x86/x86/cpu_ucode_intel.c Fri Dec 12 02:25:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode_intel.c,v 1.5 2014/03/26 08:04:19 christos Exp $ */
+/* $NetBSD: cpu_ucode_intel.c,v 1.6 2014/12/12 02:25:55 msaitoh Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu_ucode_intel.c,v 1.5 2014/03/26 08:04:19 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu_ucode_intel.c,v 1.6 2014/12/12 02:25:55 msaitoh Exp $);
#include opt_xen.h
#include opt_cpu_ucode.h
@@ -46,10 +46,6 @@ __KERNEL_RCSID(0, $NetBSD: cpu_ucode_in
#include machine/specialreg.h
#include x86/cpu_ucode.h
-#define MSR_IA32_PLATFORM_ID 0x17
-#define MSR_IA32_BIOS_UPDT_TRIGGER 0x79
-#define MSR_IA32_BIOS_SIGN_ID 0x8b
-
static void
intel_getcurrentucode(uint32_t *ucodeversion, int *platformid)
{
@@ -58,9 +54,9 @@ intel_getcurrentucode(uint32_t *ucodever
kpreempt_disable();
- wrmsr(MSR_IA32_BIOS_SIGN_ID, 0);
+ wrmsr(MSR_BIOS_SIGN, 0);
x86_cpuid(0, unneeded_ids);
- msr = rdmsr(MSR_IA32_BIOS_SIGN_ID);
+ msr = rdmsr(MSR_BIOS_SIGN);
*ucodeversion = msr 32;
kpreempt_enable();
@@ -138,7 +134,7 @@ cpu_ucode_intel_apply(struct cpu_ucode_s
kpreempt_enable();
return EEXIST; /* ??? */
}
- wrmsr(MSR_IA32_BIOS_UPDT_TRIGGER, (uintptr_t)(sc-sc_blob) + 48);
+ wrmsr(MSR_BIOS_UPDT_TRIG, (uintptr_t)(sc-sc_blob) + 48);
intel_getcurrentucode(nucodeversion, platformid);
kpreempt_enable();
CVS commit: src/sys/dev/usb
Module Name:src Committed By: msaitoh Date: Fri Dec 12 05:18:35 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add BUFFALO GX-DVI/U2B DisplayLink USB-DVI box. PR#49105 from MOCHIDA Shuji. To generate a diff of this commit: cvs rdiff -u -r1.684 -r1.685 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.684 src/sys/dev/usb/usbdevs:1.685 --- src/sys/dev/usb/usbdevs:1.684 Sat Nov 22 14:30:57 2014 +++ src/sys/dev/usb/usbdevs Fri Dec 12 05:18:35 2014 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.684 2014/11/22 14:30:57 njoly Exp $ +$NetBSD: usbdevs,v 1.685 2014/12/12 05:18:35 msaitoh Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1300,6 +1300,7 @@ product DISPLAYLINK HPDOCK 0x01d4 HP USB product DISPLAYLINK NL571 0x01d7 HP USB DVI product DISPLAYLINK M01061 0x01e2 Lenovo DVI product DISPLAYLINK NBDOCK 0x0215 VideoHome NBdock1920 +product DISPLAYLINK GXDVIU2B 0x0223 BUFFALO GX-DVI/U2B product DISPLAYLINK SWDVI 0x024c SUNWEIT DVI product DISPLAYLINK LUM70 0x02a9 Lilliput UM-70 product DISPLAYLINK LCD8000UD_DVI 0x02b8 LCD-8000UD-DVI
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: msaitoh
Date: Fri Dec 12 05:19:33 UTC 2014
Modified Files:
src/sys/dev/usb: udl.c
Log Message:
Add BUFFALO GX-DVI/U2B DisplayLink USB-DVI box. PR#49105 from MOCHIDA Shuji.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/udl.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/usb/udl.c
diff -u src/sys/dev/usb/udl.c:1.11 src/sys/dev/usb/udl.c:1.12
--- src/sys/dev/usb/udl.c:1.11 Sun Feb 23 13:22:32 2014
+++ src/sys/dev/usb/udl.c Fri Dec 12 05:19:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: udl.c,v 1.11 2014/02/23 13:22:32 skrll Exp $ */
+/* $NetBSD: udl.c,v 1.12 2014/12/12 05:19:33 msaitoh Exp $ */
/*-
* Copyright (c) 2009 FUKAUMI Naoki.
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: udl.c,v 1.11 2014/02/23 13:22:32 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: udl.c,v 1.12 2014/12/12 05:19:33 msaitoh Exp $);
#include sys/param.h
#include sys/device.h
@@ -314,6 +314,7 @@ static const struct usb_devno udl_devs[]
{ USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_WSDVI },
{ USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_EC008 },
{ USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_GXDVIU2 },
+ { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_GXDVIU2B },
{ USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_LCD4300U },
{ USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_LCD8000U },
{ USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_HPDOCK },
CVS commit: [netbsd-5] xsrc/xfree/xc/programs/Xserver
Module Name:xsrc Committed By: snj Date: Fri Dec 12 06:54:25 UTC 2014 Modified Files: xsrc/xfree/xc/programs/Xserver/GL/glx [netbsd-5]: glxcmds.c glxcmdsswap.c glxserver.h rensize.c single2.c single2swap.c singlepix.c singlepixswap.c unpack.h xsrc/xfree/xc/programs/Xserver/Xext [netbsd-5]: xcmisc.c xvdisp.c xsrc/xfree/xc/programs/Xserver/Xi [netbsd-5]: chgdctl.c chgfctl.c sendexev.c xsrc/xfree/xc/programs/Xserver/dbe [netbsd-5]: dbe.c xsrc/xfree/xc/programs/Xserver/dix [netbsd-5]: dispatch.c xsrc/xfree/xc/programs/Xserver/include [netbsd-5]: dix.h misc.h xsrc/xfree/xc/programs/Xserver/os [netbsd-5]: access.c rpcauth.c xsrc/xfree/xc/programs/Xserver/randr [netbsd-5]: randr.c xsrc/xfree/xc/programs/Xserver/render [netbsd-5]: render.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1935): xfree/xc/programs/Xserver/dix/dispatch.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xvdisp.c: revision 1.2 xfree/xc/programs/Xserver/include/misc.h: revision 1.2 xfree/xc/programs/Xserver/render/render.c: revision 1.4 xfree/xc/programs/Xserver/GL/glx/singlepixswap.c: revision 1.2 xfree/xc/programs/Xserver/Xi/sendexev.c: revision 1.2 xfree/xc/programs/Xserver/include/dix.h: revision 1.2 xfree/xc/programs/Xserver/os/access.c: revision 1.7 xfree/xc/programs/Xserver/GL/glx/glxserver.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/rensize.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/unpack.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/singlepix.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgfctl.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgdctl.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmds.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xcmisc.c: revision 1.3 xfree/xc/programs/Xserver/randr/randr.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c: revision 1.2 xfree/xc/programs/Xserver/os/rpcauth.c: revision 1.2 xfree/xc/programs/Xserver/dbe/dbe.c: revision 1.3 xfree/xc/programs/Xserver/GL/glx/single2.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/single2swap.c: revision 1.2 pull over from xorg-server, porting as necessary. - -- apply fixes for: X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers backported to 1.10.x by myself. included are fixes for: denial of service due to unchecked malloc in client authentication CVE-2014-8091 integer overflows calculating memory needs for requests CVE-2014-8092 CVE-2014-8093 CVE-2014-8094 out of bounds access due to not validating length or offset values in requests CVE-2014-8095 CVE-2014-8096 CVE-2014-8097 CVE-2014-8098 CVE-2014-8099 CVE-2014-8100 CVE-2014-8101 CVE-2014-8102 CVE-2014-8103 - -- apply two more parts of CVE-2014-8092: Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5] dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6] - -- To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.1.1.6.8.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h cvs rdiff -u -r1.1.1.7 -r1.1.1.7.8.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.22.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.22.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c cvs rdiff -u -r1.2 -r1.2.2.1 xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.20.1 \ xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.22.1 \ xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c cvs rdiff -u -r1.2 -r1.2.2.1 xsrc/xfree/xc/programs/Xserver/dbe/dbe.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.8.1 \ xsrc/xfree/xc/programs/Xserver/dix/dispatch.c cvs rdiff -u -r1.1.1.6 -r1.1.1.6.20.1 \ xsrc/xfree/xc/programs/Xserver/include/dix.h cvs rdiff -u -r1.1.1.6 -r1.1.1.6.8.1 \ xsrc/xfree/xc/programs/Xserver/include/misc.h cvs rdiff -u -r1.6 -r1.6.8.1 xsrc/xfree/xc/programs/Xserver/os/access.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.20.1 \ xsrc/xfree/xc/programs/Xserver/os/rpcauth.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.20.1 \ xsrc/xfree/xc/programs/Xserver/randr/randr.c cvs rdiff -u -r1.3 -r1.3.2.1 xsrc/xfree/xc/programs/Xserver/render/render.c Please note that diffs are not public
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Fri Dec 12 06:56:12 UTC 2014 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: update 1935 To generate a diff of this commit: cvs rdiff -u -r1.1.2.84 -r1.1.2.85 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.84 src/doc/CHANGES-5.3:1.1.2.85 --- src/doc/CHANGES-5.3:1.1.2.84 Wed Dec 10 23:01:20 2014 +++ src/doc/CHANGES-5.3 Fri Dec 12 06:56:12 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.84 2014/12/10 23:01:20 snj Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.85 2014/12/12 06:56:12 snj Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -1220,6 +1220,28 @@ xsrc/external/mit/xorg-server/dist/os/rp xsrc/external/mit/xorg-server/dist/randr/rrsdispatch.c patch xsrc/external/mit/xorg-server/dist/render/render.c patch xsrc/external/mit/xorg-server/dist/xfixes/select.c patch +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h 1.2 +xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c 1.3 +xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c 1.2 +xsrc/xfree/xc/programs/Xserver/dbe/dbe.c 1.3 +xsrc/xfree/xc/programs/Xserver/dix/dispatch.c 1.2 +xsrc/xfree/xc/programs/Xserver/include/dix.h 1.2 +xsrc/xfree/xc/programs/Xserver/include/misc.h 1.2 +xsrc/xfree/xc/programs/Xserver/os/access.c 1.7 +xsrc/xfree/xc/programs/Xserver/os/rpcauth.c 1.2 +xsrc/xfree/xc/programs/Xserver/randr/randr.c 1.2 +xsrc/xfree/xc/programs/Xserver/render/render.c 1.4 apply fixes for X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers
CVS commit: [netbsd-5-1] xsrc/xfree/xc/programs/Xserver
Module Name:xsrc Committed By: snj Date: Fri Dec 12 06:56:54 UTC 2014 Modified Files: xsrc/xfree/xc/programs/Xserver/GL/glx [netbsd-5-1]: glxcmds.c glxcmdsswap.c glxserver.h rensize.c single2.c single2swap.c singlepix.c singlepixswap.c unpack.h xsrc/xfree/xc/programs/Xserver/Xext [netbsd-5-1]: xcmisc.c xvdisp.c xsrc/xfree/xc/programs/Xserver/Xi [netbsd-5-1]: chgdctl.c chgfctl.c sendexev.c xsrc/xfree/xc/programs/Xserver/dbe [netbsd-5-1]: dbe.c xsrc/xfree/xc/programs/Xserver/dix [netbsd-5-1]: dispatch.c xsrc/xfree/xc/programs/Xserver/include [netbsd-5-1]: dix.h misc.h xsrc/xfree/xc/programs/Xserver/os [netbsd-5-1]: access.c rpcauth.c xsrc/xfree/xc/programs/Xserver/randr [netbsd-5-1]: randr.c xsrc/xfree/xc/programs/Xserver/render [netbsd-5-1]: render.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1935): xfree/xc/programs/Xserver/dix/dispatch.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xvdisp.c: revision 1.2 xfree/xc/programs/Xserver/include/misc.h: revision 1.2 xfree/xc/programs/Xserver/render/render.c: revision 1.4 xfree/xc/programs/Xserver/GL/glx/singlepixswap.c: revision 1.2 xfree/xc/programs/Xserver/Xi/sendexev.c: revision 1.2 xfree/xc/programs/Xserver/include/dix.h: revision 1.2 xfree/xc/programs/Xserver/os/access.c: revision 1.7 xfree/xc/programs/Xserver/GL/glx/glxserver.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/rensize.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/unpack.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/singlepix.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgfctl.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgdctl.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmds.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xcmisc.c: revision 1.3 xfree/xc/programs/Xserver/randr/randr.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c: revision 1.2 xfree/xc/programs/Xserver/os/rpcauth.c: revision 1.2 xfree/xc/programs/Xserver/dbe/dbe.c: revision 1.3 xfree/xc/programs/Xserver/GL/glx/single2.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/single2swap.c: revision 1.2 pull over from xorg-server, porting as necessary. - -- apply fixes for: X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers backported to 1.10.x by myself. included are fixes for: denial of service due to unchecked malloc in client authentication CVE-2014-8091 integer overflows calculating memory needs for requests CVE-2014-8092 CVE-2014-8093 CVE-2014-8094 out of bounds access due to not validating length or offset values in requests CVE-2014-8095 CVE-2014-8096 CVE-2014-8097 CVE-2014-8098 CVE-2014-8099 CVE-2014-8100 CVE-2014-8101 CVE-2014-8102 CVE-2014-8103 - -- apply two more parts of CVE-2014-8092: Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5] dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6] - -- To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.1.1.6.12.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h cvs rdiff -u -r1.1.1.7 -r1.1.1.7.12.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.26.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.26.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c cvs rdiff -u -r1.2 -r1.2.6.1 xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.24.1 \ xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.26.1 \ xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c cvs rdiff -u -r1.2 -r1.2.6.1 xsrc/xfree/xc/programs/Xserver/dbe/dbe.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.12.1 \ xsrc/xfree/xc/programs/Xserver/dix/dispatch.c cvs rdiff -u -r1.1.1.6 -r1.1.1.6.24.1 \ xsrc/xfree/xc/programs/Xserver/include/dix.h cvs rdiff -u -r1.1.1.6 -r1.1.1.6.12.1 \ xsrc/xfree/xc/programs/Xserver/include/misc.h cvs rdiff -u -r1.6 -r1.6.12.1 xsrc/xfree/xc/programs/Xserver/os/access.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.24.1 \ xsrc/xfree/xc/programs/Xserver/os/rpcauth.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.24.1 \ xsrc/xfree/xc/programs/Xserver/randr/randr.c cvs rdiff -u -r1.3 -r1.3.6.1 xsrc/xfree/xc/programs/Xserver/render/render.c Please note that
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: snj Date: Fri Dec 12 06:58:00 UTC 2014 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: update 1935 To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 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.6 src/doc/CHANGES-5.1.6:1.1.2.7 --- src/doc/CHANGES-5.1.6:1.1.2.6 Wed Dec 10 23:01:02 2014 +++ src/doc/CHANGES-5.1.6 Fri Dec 12 06:58:00 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.6,v 1.1.2.6 2014/12/10 23:01:02 snj Exp $ +# $NetBSD: CHANGES-5.1.6,v 1.1.2.7 2014/12/12 06:58:00 snj Exp $ A complete list of changes from the NetBSD 5.1.5 release to the NetBSD 5.1.6 release: @@ -76,6 +76,28 @@ xsrc/external/mit/xorg-server/dist/os/rp xsrc/external/mit/xorg-server/dist/randr/rrsdispatch.c patch xsrc/external/mit/xorg-server/dist/render/render.c patch xsrc/external/mit/xorg-server/dist/xfixes/select.c patch +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h 1.2 +xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c 1.3 +xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c 1.2 +xsrc/xfree/xc/programs/Xserver/dbe/dbe.c 1.3 +xsrc/xfree/xc/programs/Xserver/dix/dispatch.c 1.2 +xsrc/xfree/xc/programs/Xserver/include/dix.h 1.2 +xsrc/xfree/xc/programs/Xserver/include/misc.h 1.2 +xsrc/xfree/xc/programs/Xserver/os/access.c 1.7 +xsrc/xfree/xc/programs/Xserver/os/rpcauth.c 1.2 +xsrc/xfree/xc/programs/Xserver/randr/randr.c 1.2 +xsrc/xfree/xc/programs/Xserver/render/render.c 1.4 apply fixes for X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers
CVS commit: [netbsd-5-2] xsrc/xfree/xc/programs/Xserver
Module Name:xsrc Committed By: snj Date: Fri Dec 12 06:58:37 UTC 2014 Modified Files: xsrc/xfree/xc/programs/Xserver/GL/glx [netbsd-5-2]: glxcmds.c glxcmdsswap.c glxserver.h rensize.c single2.c single2swap.c singlepix.c singlepixswap.c unpack.h xsrc/xfree/xc/programs/Xserver/Xext [netbsd-5-2]: xcmisc.c xvdisp.c xsrc/xfree/xc/programs/Xserver/Xi [netbsd-5-2]: chgdctl.c chgfctl.c sendexev.c xsrc/xfree/xc/programs/Xserver/dbe [netbsd-5-2]: dbe.c xsrc/xfree/xc/programs/Xserver/dix [netbsd-5-2]: dispatch.c xsrc/xfree/xc/programs/Xserver/include [netbsd-5-2]: dix.h misc.h xsrc/xfree/xc/programs/Xserver/os [netbsd-5-2]: access.c rpcauth.c xsrc/xfree/xc/programs/Xserver/randr [netbsd-5-2]: randr.c xsrc/xfree/xc/programs/Xserver/render [netbsd-5-2]: render.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1935): xfree/xc/programs/Xserver/dix/dispatch.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xvdisp.c: revision 1.2 xfree/xc/programs/Xserver/include/misc.h: revision 1.2 xfree/xc/programs/Xserver/render/render.c: revision 1.4 xfree/xc/programs/Xserver/GL/glx/singlepixswap.c: revision 1.2 xfree/xc/programs/Xserver/Xi/sendexev.c: revision 1.2 xfree/xc/programs/Xserver/include/dix.h: revision 1.2 xfree/xc/programs/Xserver/os/access.c: revision 1.7 xfree/xc/programs/Xserver/GL/glx/glxserver.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/rensize.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/unpack.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/singlepix.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgfctl.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgdctl.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmds.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xcmisc.c: revision 1.3 xfree/xc/programs/Xserver/randr/randr.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c: revision 1.2 xfree/xc/programs/Xserver/os/rpcauth.c: revision 1.2 xfree/xc/programs/Xserver/dbe/dbe.c: revision 1.3 xfree/xc/programs/Xserver/GL/glx/single2.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/single2swap.c: revision 1.2 pull over from xorg-server, porting as necessary. - -- apply fixes for: X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers backported to 1.10.x by myself. included are fixes for: denial of service due to unchecked malloc in client authentication CVE-2014-8091 integer overflows calculating memory needs for requests CVE-2014-8092 CVE-2014-8093 CVE-2014-8094 out of bounds access due to not validating length or offset values in requests CVE-2014-8095 CVE-2014-8096 CVE-2014-8097 CVE-2014-8098 CVE-2014-8099 CVE-2014-8100 CVE-2014-8101 CVE-2014-8102 CVE-2014-8103 - -- apply two more parts of CVE-2014-8092: Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5] dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6] - -- To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.1.1.6.18.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h cvs rdiff -u -r1.1.1.7 -r1.1.1.7.18.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.32.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.32.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c cvs rdiff -u -r1.2 -r1.2.12.1 xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.30.1 \ xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.32.1 \ xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c cvs rdiff -u -r1.2 -r1.2.12.1 xsrc/xfree/xc/programs/Xserver/dbe/dbe.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.18.1 \ xsrc/xfree/xc/programs/Xserver/dix/dispatch.c cvs rdiff -u -r1.1.1.6 -r1.1.1.6.30.1 \ xsrc/xfree/xc/programs/Xserver/include/dix.h cvs rdiff -u -r1.1.1.6 -r1.1.1.6.18.1 \ xsrc/xfree/xc/programs/Xserver/include/misc.h cvs rdiff -u -r1.6 -r1.6.18.1 xsrc/xfree/xc/programs/Xserver/os/access.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.30.1 \ xsrc/xfree/xc/programs/Xserver/os/rpcauth.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.30.1 \ xsrc/xfree/xc/programs/Xserver/randr/randr.c cvs rdiff -u -r1.3 -r1.3.12.1 xsrc/xfree/xc/programs/Xserver/render/render.c Please note that
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: snj Date: Fri Dec 12 06:59:16 UTC 2014 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: update 1935 To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 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.6 src/doc/CHANGES-5.2.4:1.1.2.7 --- src/doc/CHANGES-5.2.4:1.1.2.6 Wed Dec 10 23:00:36 2014 +++ src/doc/CHANGES-5.2.4 Fri Dec 12 06:59:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.4,v 1.1.2.6 2014/12/10 23:00:36 snj Exp $ +# $NetBSD: CHANGES-5.2.4,v 1.1.2.7 2014/12/12 06:59:16 snj Exp $ A complete list of changes from the NetBSD 5.2.3 release to the NetBSD 5.2.4 release: @@ -76,6 +76,28 @@ xsrc/external/mit/xorg-server/dist/os/rp xsrc/external/mit/xorg-server/dist/randr/rrsdispatch.c patch xsrc/external/mit/xorg-server/dist/render/render.c patch xsrc/external/mit/xorg-server/dist/xfixes/select.c patch +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h 1.2 +xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c 1.3 +xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c 1.2 +xsrc/xfree/xc/programs/Xserver/dbe/dbe.c 1.3 +xsrc/xfree/xc/programs/Xserver/dix/dispatch.c 1.2 +xsrc/xfree/xc/programs/Xserver/include/dix.h 1.2 +xsrc/xfree/xc/programs/Xserver/include/misc.h 1.2 +xsrc/xfree/xc/programs/Xserver/os/access.c 1.7 +xsrc/xfree/xc/programs/Xserver/os/rpcauth.c 1.2 +xsrc/xfree/xc/programs/Xserver/randr/randr.c 1.2 +xsrc/xfree/xc/programs/Xserver/render/render.c 1.4 apply fixes for X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers
CVS commit: [netbsd-6] xsrc/xfree/xc/programs/Xserver
Module Name:xsrc Committed By: snj Date: Fri Dec 12 07:15:06 UTC 2014 Modified Files: xsrc/xfree/xc/programs/Xserver/GL/glx [netbsd-6]: glxcmds.c glxcmdsswap.c glxserver.h rensize.c single2.c single2swap.c singlepix.c singlepixswap.c unpack.h xsrc/xfree/xc/programs/Xserver/Xext [netbsd-6]: xcmisc.c xvdisp.c xsrc/xfree/xc/programs/Xserver/Xi [netbsd-6]: chgdctl.c chgfctl.c sendexev.c xsrc/xfree/xc/programs/Xserver/dbe [netbsd-6]: dbe.c xsrc/xfree/xc/programs/Xserver/dix [netbsd-6]: dispatch.c xsrc/xfree/xc/programs/Xserver/include [netbsd-6]: dix.h misc.h xsrc/xfree/xc/programs/Xserver/os [netbsd-6]: access.c rpcauth.c xsrc/xfree/xc/programs/Xserver/randr [netbsd-6]: randr.c xsrc/xfree/xc/programs/Xserver/render [netbsd-6]: render.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1208): xfree/xc/programs/Xserver/dix/dispatch.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xvdisp.c: revision 1.2 xfree/xc/programs/Xserver/include/misc.h: revision 1.2 xfree/xc/programs/Xserver/render/render.c: revision 1.4 xfree/xc/programs/Xserver/GL/glx/singlepixswap.c: revision 1.2 xfree/xc/programs/Xserver/Xi/sendexev.c: revision 1.2 xfree/xc/programs/Xserver/include/dix.h: revision 1.2 xfree/xc/programs/Xserver/os/access.c: revision 1.7 xfree/xc/programs/Xserver/GL/glx/glxserver.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/rensize.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/unpack.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/singlepix.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgfctl.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgdctl.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmds.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xcmisc.c: revision 1.3 xfree/xc/programs/Xserver/randr/randr.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c: revision 1.2 xfree/xc/programs/Xserver/os/rpcauth.c: revision 1.2 xfree/xc/programs/Xserver/dbe/dbe.c: revision 1.3 xfree/xc/programs/Xserver/GL/glx/single2.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/single2swap.c: revision 1.2 pull over from xorg-server, porting as necessary. - -- apply fixes for: X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers backported to 1.10.x by myself. included are fixes for: denial of service due to unchecked malloc in client authentication CVE-2014-8091 integer overflows calculating memory needs for requests CVE-2014-8092 CVE-2014-8093 CVE-2014-8094 out of bounds access due to not validating length or offset values in requests CVE-2014-8095 CVE-2014-8096 CVE-2014-8097 CVE-2014-8098 CVE-2014-8099 CVE-2014-8100 CVE-2014-8101 CVE-2014-8102 CVE-2014-8103 - -- apply two more parts of CVE-2014-8092: Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5] dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6] - -- To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.1.1.6.14.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h cvs rdiff -u -r1.1.1.7 -r1.1.1.7.14.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.28.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.28.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c cvs rdiff -u -r1.2 -r1.2.8.1 xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.26.1 \ xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.28.1 \ xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c cvs rdiff -u -r1.2 -r1.2.8.1 xsrc/xfree/xc/programs/Xserver/dbe/dbe.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.14.1 \ xsrc/xfree/xc/programs/Xserver/dix/dispatch.c cvs rdiff -u -r1.1.1.6 -r1.1.1.6.26.1 \ xsrc/xfree/xc/programs/Xserver/include/dix.h cvs rdiff -u -r1.1.1.6 -r1.1.1.6.14.1 \ xsrc/xfree/xc/programs/Xserver/include/misc.h cvs rdiff -u -r1.6 -r1.6.14.1 xsrc/xfree/xc/programs/Xserver/os/access.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.26.1 \ xsrc/xfree/xc/programs/Xserver/os/rpcauth.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.26.1 \ xsrc/xfree/xc/programs/Xserver/randr/randr.c cvs rdiff -u -r1.3 -r1.3.8.1 xsrc/xfree/xc/programs/Xserver/render/render.c Please note that diffs are not public
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: snj Date: Fri Dec 12 07:15:43 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: update 1208 To generate a diff of this commit: cvs rdiff -u -r1.1.2.163 -r1.1.2.164 src/doc/CHANGES-6.2 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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.163 src/doc/CHANGES-6.2:1.1.2.164 --- src/doc/CHANGES-6.2:1.1.2.163 Wed Dec 10 22:49:51 2014 +++ src/doc/CHANGES-6.2 Fri Dec 12 07:15:43 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.163 2014/12/10 22:49:51 snj Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.164 2014/12/12 07:15:43 snj Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -4730,6 +4730,28 @@ xsrc/external/mit/xorg-server/dist/test/ xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c patch xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c patch xsrc/external/mit/xorg-server/dist/xfixes/select.c patch +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h 1.2 +xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c 1.3 +xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c 1.2 +xsrc/xfree/xc/programs/Xserver/dbe/dbe.c 1.3 +xsrc/xfree/xc/programs/Xserver/dix/dispatch.c 1.2 +xsrc/xfree/xc/programs/Xserver/include/dix.h 1.2 +xsrc/xfree/xc/programs/Xserver/include/misc.h 1.2 +xsrc/xfree/xc/programs/Xserver/os/access.c 1.7 +xsrc/xfree/xc/programs/Xserver/os/rpcauth.c 1.2 +xsrc/xfree/xc/programs/Xserver/randr/randr.c 1.2 +xsrc/xfree/xc/programs/Xserver/render/render.c 1.4 apply fixes for X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers
CVS commit: [netbsd-6-1] xsrc/xfree/xc/programs/Xserver
Module Name:xsrc Committed By: snj Date: Fri Dec 12 07:19:56 UTC 2014 Modified Files: xsrc/xfree/xc/programs/Xserver/GL/glx [netbsd-6-1]: glxcmds.c glxcmdsswap.c glxserver.h rensize.c single2.c single2swap.c singlepix.c singlepixswap.c unpack.h xsrc/xfree/xc/programs/Xserver/Xext [netbsd-6-1]: xcmisc.c xvdisp.c xsrc/xfree/xc/programs/Xserver/Xi [netbsd-6-1]: chgdctl.c chgfctl.c sendexev.c xsrc/xfree/xc/programs/Xserver/dbe [netbsd-6-1]: dbe.c xsrc/xfree/xc/programs/Xserver/dix [netbsd-6-1]: dispatch.c xsrc/xfree/xc/programs/Xserver/include [netbsd-6-1]: dix.h misc.h xsrc/xfree/xc/programs/Xserver/os [netbsd-6-1]: access.c rpcauth.c xsrc/xfree/xc/programs/Xserver/randr [netbsd-6-1]: randr.c xsrc/xfree/xc/programs/Xserver/render [netbsd-6-1]: render.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1208): xfree/xc/programs/Xserver/dix/dispatch.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xvdisp.c: revision 1.2 xfree/xc/programs/Xserver/include/misc.h: revision 1.2 xfree/xc/programs/Xserver/render/render.c: revision 1.4 xfree/xc/programs/Xserver/GL/glx/singlepixswap.c: revision 1.2 xfree/xc/programs/Xserver/Xi/sendexev.c: revision 1.2 xfree/xc/programs/Xserver/include/dix.h: revision 1.2 xfree/xc/programs/Xserver/os/access.c: revision 1.7 xfree/xc/programs/Xserver/GL/glx/glxserver.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/rensize.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/unpack.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/singlepix.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgfctl.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgdctl.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmds.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xcmisc.c: revision 1.3 xfree/xc/programs/Xserver/randr/randr.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c: revision 1.2 xfree/xc/programs/Xserver/os/rpcauth.c: revision 1.2 xfree/xc/programs/Xserver/dbe/dbe.c: revision 1.3 xfree/xc/programs/Xserver/GL/glx/single2.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/single2swap.c: revision 1.2 pull over from xorg-server, porting as necessary. - -- apply fixes for: X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers backported to 1.10.x by myself. included are fixes for: denial of service due to unchecked malloc in client authentication CVE-2014-8091 integer overflows calculating memory needs for requests CVE-2014-8092 CVE-2014-8093 CVE-2014-8094 out of bounds access due to not validating length or offset values in requests CVE-2014-8095 CVE-2014-8096 CVE-2014-8097 CVE-2014-8098 CVE-2014-8099 CVE-2014-8100 CVE-2014-8101 CVE-2014-8102 CVE-2014-8103 - -- apply two more parts of CVE-2014-8092: Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5] dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6] - -- To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.1.1.6.20.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h cvs rdiff -u -r1.1.1.7 -r1.1.1.7.20.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.34.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.34.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c cvs rdiff -u -r1.2 -r1.2.14.1 xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.32.1 \ xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.34.1 \ xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c cvs rdiff -u -r1.2 -r1.2.14.1 xsrc/xfree/xc/programs/Xserver/dbe/dbe.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.20.1 \ xsrc/xfree/xc/programs/Xserver/dix/dispatch.c cvs rdiff -u -r1.1.1.6 -r1.1.1.6.32.1 \ xsrc/xfree/xc/programs/Xserver/include/dix.h cvs rdiff -u -r1.1.1.6 -r1.1.1.6.20.1 \ xsrc/xfree/xc/programs/Xserver/include/misc.h cvs rdiff -u -r1.6 -r1.6.20.1 xsrc/xfree/xc/programs/Xserver/os/access.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.32.1 \ xsrc/xfree/xc/programs/Xserver/os/rpcauth.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.32.1 \ xsrc/xfree/xc/programs/Xserver/randr/randr.c cvs rdiff -u -r1.3 -r1.3.14.1 xsrc/xfree/xc/programs/Xserver/render/render.c Please note that
CVS commit: src/sys/dev/usb
Module Name:src Committed By: msaitoh Date: Fri Dec 12 07:21:05 UTC 2014 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add Validity Sensors, Inc. and their devices. PR#45732 from Greg A. Woods. To generate a diff of this commit: cvs rdiff -u -r1.685 -r1.686 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.685 src/sys/dev/usb/usbdevs:1.686 --- src/sys/dev/usb/usbdevs:1.685 Fri Dec 12 05:18:35 2014 +++ src/sys/dev/usb/usbdevs Fri Dec 12 07:21:05 2014 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.685 2014/12/12 05:18:35 msaitoh Exp $ +$NetBSD: usbdevs,v 1.686 2014/12/12 07:21:05 msaitoh Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -486,6 +486,7 @@ vendor AINCOMM 0x12fd Aincomm vendor MOBILITY 0x1342 Mobility vendor DICKSMITH 0x1371 Dick Smith Electronics vendor NETGEAR3 0x1385 Netgear +vendor VALIDITY 0x138a Validity Sensors, Inc. vendor BALTECH 0x13ad Baltech vendor CISCOLINKSYS 0x13b1 Cisco-Linksys vendor SHARK 0x13d2 Shark @@ -3234,6 +3235,14 @@ product USI MC60 0x10c5 MC60 Serial /* GNU Radio USRP */ product USRP USRPv2 0x0002 USRP Revision 2 +/* Validity */ +product VALIDITY VFS101 0x0001 VFS101 Fingerprint Reader +product VALIDITY VFS301 0x0005 VFS301 Fingerprint Reader +product VALIDITY VFS451 0x0007 VFS451 Fingerprint Reader +product VALIDITY VFS300 0x0008 VFS300 Fingerprint Reader +product VALIDITY VFS5011 0x0011 VFS5011 Fingerprint Reader +product VALIDITY VFS471 0x003c VFS471 Fingerprint Reader + /* VidzMedia products */ product VIDZMEDIA MONSTERTV 0x4fb1 MonsterTV P2H
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: snj Date: Fri Dec 12 07:21:20 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: update 1208 To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-6.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-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.14 src/doc/CHANGES-6.1.6:1.1.2.15 --- src/doc/CHANGES-6.1.6:1.1.2.14 Wed Dec 10 22:50:34 2014 +++ src/doc/CHANGES-6.1.6 Fri Dec 12 07:21:20 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.14 2014/12/10 22:50:34 snj Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.15 2014/12/12 07:21:20 snj Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -291,6 +291,28 @@ xsrc/external/mit/xorg-server/dist/test/ xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c patch xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c patch xsrc/external/mit/xorg-server/dist/xfixes/select.c patch +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h 1.2 +xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c 1.3 +xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c 1.2 +xsrc/xfree/xc/programs/Xserver/dbe/dbe.c 1.3 +xsrc/xfree/xc/programs/Xserver/dix/dispatch.c 1.2 +xsrc/xfree/xc/programs/Xserver/include/dix.h 1.2 +xsrc/xfree/xc/programs/Xserver/include/misc.h 1.2 +xsrc/xfree/xc/programs/Xserver/os/access.c 1.7 +xsrc/xfree/xc/programs/Xserver/os/rpcauth.c 1.2 +xsrc/xfree/xc/programs/Xserver/randr/randr.c 1.2 +xsrc/xfree/xc/programs/Xserver/render/render.c 1.4 apply fixes for X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: snj Date: Fri Dec 12 07:28:02 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: update 1208 To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-6.0.7 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-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.14 src/doc/CHANGES-6.0.7:1.1.2.15 --- src/doc/CHANGES-6.0.7:1.1.2.14 Wed Dec 10 22:51:01 2014 +++ src/doc/CHANGES-6.0.7 Fri Dec 12 07:28:02 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.14 2014/12/10 22:51:01 snj Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.15 2014/12/12 07:28:02 snj Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -291,6 +291,28 @@ xsrc/external/mit/xorg-server/dist/test/ xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c patch xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c patch xsrc/external/mit/xorg-server/dist/xfixes/select.c patch +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c 1.2 +xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h 1.2 +xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c 1.3 +xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c 1.2 +xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c 1.2 +xsrc/xfree/xc/programs/Xserver/dbe/dbe.c 1.3 +xsrc/xfree/xc/programs/Xserver/dix/dispatch.c 1.2 +xsrc/xfree/xc/programs/Xserver/include/dix.h 1.2 +xsrc/xfree/xc/programs/Xserver/include/misc.h 1.2 +xsrc/xfree/xc/programs/Xserver/os/access.c 1.7 +xsrc/xfree/xc/programs/Xserver/os/rpcauth.c 1.2 +xsrc/xfree/xc/programs/Xserver/randr/randr.c 1.2 +xsrc/xfree/xc/programs/Xserver/render/render.c 1.4 apply fixes for X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers
CVS commit: [netbsd-6-0] xsrc/xfree/xc/programs/Xserver
Module Name:xsrc Committed By: snj Date: Fri Dec 12 07:25:34 UTC 2014 Modified Files: xsrc/xfree/xc/programs/Xserver/GL/glx [netbsd-6-0]: glxcmds.c glxcmdsswap.c glxserver.h rensize.c single2.c single2swap.c singlepix.c singlepixswap.c unpack.h xsrc/xfree/xc/programs/Xserver/Xext [netbsd-6-0]: xcmisc.c xvdisp.c xsrc/xfree/xc/programs/Xserver/Xi [netbsd-6-0]: chgdctl.c chgfctl.c sendexev.c xsrc/xfree/xc/programs/Xserver/dbe [netbsd-6-0]: dbe.c xsrc/xfree/xc/programs/Xserver/dix [netbsd-6-0]: dispatch.c xsrc/xfree/xc/programs/Xserver/include [netbsd-6-0]: dix.h misc.h xsrc/xfree/xc/programs/Xserver/os [netbsd-6-0]: access.c rpcauth.c xsrc/xfree/xc/programs/Xserver/randr [netbsd-6-0]: randr.c xsrc/xfree/xc/programs/Xserver/render [netbsd-6-0]: render.c Log Message: Pull up following revision(s) (requested by mrg in ticket #1208): xfree/xc/programs/Xserver/dix/dispatch.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xvdisp.c: revision 1.2 xfree/xc/programs/Xserver/include/misc.h: revision 1.2 xfree/xc/programs/Xserver/render/render.c: revision 1.4 xfree/xc/programs/Xserver/GL/glx/singlepixswap.c: revision 1.2 xfree/xc/programs/Xserver/Xi/sendexev.c: revision 1.2 xfree/xc/programs/Xserver/include/dix.h: revision 1.2 xfree/xc/programs/Xserver/os/access.c: revision 1.7 xfree/xc/programs/Xserver/GL/glx/glxserver.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/rensize.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/unpack.h: revision 1.2 xfree/xc/programs/Xserver/GL/glx/singlepix.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgfctl.c: revision 1.2 xfree/xc/programs/Xserver/Xi/chgdctl.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmds.c: revision 1.2 xfree/xc/programs/Xserver/Xext/xcmisc.c: revision 1.3 xfree/xc/programs/Xserver/randr/randr.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c: revision 1.2 xfree/xc/programs/Xserver/os/rpcauth.c: revision 1.2 xfree/xc/programs/Xserver/dbe/dbe.c: revision 1.3 xfree/xc/programs/Xserver/GL/glx/single2.c: revision 1.2 xfree/xc/programs/Xserver/GL/glx/single2swap.c: revision 1.2 pull over from xorg-server, porting as necessary. - -- apply fixes for: X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers backported to 1.10.x by myself. included are fixes for: denial of service due to unchecked malloc in client authentication CVE-2014-8091 integer overflows calculating memory needs for requests CVE-2014-8092 CVE-2014-8093 CVE-2014-8094 out of bounds access due to not validating length or offset values in requests CVE-2014-8095 CVE-2014-8096 CVE-2014-8097 CVE-2014-8098 CVE-2014-8099 CVE-2014-8100 CVE-2014-8101 CVE-2014-8102 CVE-2014-8103 - -- apply two more parts of CVE-2014-8092: Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5] dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6] - -- To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.1.1.6.16.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c \ xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h cvs rdiff -u -r1.1.1.7 -r1.1.1.7.16.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.30.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.30.1 \ xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c cvs rdiff -u -r1.2 -r1.2.10.1 xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.28.1 \ xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.30.1 \ xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c \ xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c cvs rdiff -u -r1.2 -r1.2.10.1 xsrc/xfree/xc/programs/Xserver/dbe/dbe.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.16.1 \ xsrc/xfree/xc/programs/Xserver/dix/dispatch.c cvs rdiff -u -r1.1.1.6 -r1.1.1.6.28.1 \ xsrc/xfree/xc/programs/Xserver/include/dix.h cvs rdiff -u -r1.1.1.6 -r1.1.1.6.16.1 \ xsrc/xfree/xc/programs/Xserver/include/misc.h cvs rdiff -u -r1.6 -r1.6.16.1 xsrc/xfree/xc/programs/Xserver/os/access.c cvs rdiff -u -r1.1.1.5 -r1.1.1.5.28.1 \ xsrc/xfree/xc/programs/Xserver/os/rpcauth.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.28.1 \ xsrc/xfree/xc/programs/Xserver/randr/randr.c cvs rdiff -u -r1.3 -r1.3.10.1 xsrc/xfree/xc/programs/Xserver/render/render.c Please note that
