Module Name: src
Committed By: jdc
Date: Sat Oct 12 19:00:01 UTC 2013
Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.4
Log Message:
Ticket #966.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-6.0.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-6.0.4
diff -u src/doc/CHANGES-6.0.4:1.1.2.1 src/doc/CHANGES-6.0.4:1.1.2.2
--- src/doc/CHANGES-6.0.4:1.1.2.1 Sat Oct 12 18:53:17 2013
+++ src/doc/CHANGES-6.0.4 Sat Oct 12 19:00:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.4,v 1.1.2.1 2013/10/12 18:53:17 jdc Exp $
+# $NetBSD: CHANGES-6.0.4,v 1.1.2.2 2013/10/12 19:00:01 jdc Exp $
A complete list of changes from the NetBSD 6.0.3 release to the NetBSD 6.0.4
release:
@@ -10,3 +10,14 @@ sys/sys/param.h patched by hand
Welcome to 6.0.3_PATCH.
[jdc]
+xsrc/external/mit/xorg-server/dist/dix/dixfonts.c 1.2
+xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c 1.4
+
+ Fix CVE-2013-4396 using a patch from Alan Coopersmith:
+ Save a pointer to the passed in closure structure before copying it
+ and overwriting the *c pointer to point to our copy instead of the
+ original. If we hit an error, once we free(c), reset c to point to
+ the original structure before jumping to the cleanup code that
+ references *c.
+ [spz, ticket #966]
+
