[Glibc-bsd-commits] r4320 - in branches/squeeze/kfreebsd-8/debian: . patches

[Steven Chamberlain]

Author: stevenc-guest
Date: 2012-06-19 12:24:48 +0000 (Tue, 19 Jun 2012)
New Revision: 4320

Modified:
   branches/squeeze/kfreebsd-8/debian/changelog
   branches/squeeze/kfreebsd-8/debian/patches/SA-12_04.sysret.patch
Log:
Apply correction of SA-12:04.sysret patch from upstream (r237241);  needed for 8.1 only.


Modified: branches/squeeze/kfreebsd-8/debian/changelog
===================================================================
--- branches/squeeze/kfreebsd-8/debian/changelog	2012-06-17 12:58:24 UTC (rev 4319)
+++ branches/squeeze/kfreebsd-8/debian/changelog	2012-06-19 12:24:48 UTC (rev 4320)
@@ -2,9 +2,10 @@
 
   [ Steven Chamberlain ]
   * Apply upstream SA-12:04.sysret patch (CVE-2012-0217) (Closes: #677297)
+    - Include correction from upstream (r237241)
   * Apply upstream EN-12:02.ipv6refcount patch (Closes: 677738)
 
- -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Sat, 16 Jun 2012 19:07:54 +0100
+ -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Tue, 19 Jun 2012 13:18:39 +0100
 
 kfreebsd-8 (8.1+dfsg-8+squeeze2) stable-security; urgency=low
 

Modified: branches/squeeze/kfreebsd-8/debian/patches/SA-12_04.sysret.patch
===================================================================
--- branches/squeeze/kfreebsd-8/debian/patches/SA-12_04.sysret.patch	2012-06-17 12:58:24 UTC (rev 4319)
+++ branches/squeeze/kfreebsd-8/debian/patches/SA-12_04.sysret.patch	2012-06-19 12:24:48 UTC (rev 4320)
@@ -1,19 +1,22 @@
 Description:
  Correct a privilege escalation when returning from kernel if
  running FreeBSD/amd64 on non-AMD processors. [12:04]
+ .
+ Includes a corrected patch from upstream, as the original commit to
+ RELENG_8_1 accidentally applied it to the wrong location.
 Origin: vendor, http://security.freebsd.org/patches/SA-12:04/sysret.patch
 Bug: http://security.freebsd.org/advisories/FreeBSD-SA-12:04.sysret.asc
 Bug-Debian: http://bugs.debian.org/677297
-Applied-Upstream: http://svnweb.freebsd.org/base/releng/8.1/sys/amd64/amd64/trap.c?view=log&pathrev=236953
+Applied-Upstream: http://svnweb.freebsd.org/base?view=revision&revision=237241
 
 Index: kfreebsd-8-8.1+dfsg/sys/amd64/amd64/trap.c
 ===================================================================
 --- kfreebsd-8-8.1+dfsg.orig/sys/amd64/amd64/trap.c	2012-06-17 13:55:31.000000000 +0100
-+++ kfreebsd-8-8.1+dfsg/sys/amd64/amd64/trap.c	2012-06-17 13:57:30.162116018 +0100
-@@ -965,6 +965,23 @@
- 	/*
- 	 * Traced syscall.
- 	 */
++++ kfreebsd-8-8.1+dfsg/sys/amd64/amd64/trap.c	2012-06-19 12:44:37.299956401 +0100
+@@ -1010,4 +1010,21 @@
+ 	STOPEVENT(p, S_SCX, sa.code);
+ 
+ 	PTRACESTOP_SC(p, td, S_PT_SCX);
 +
 +	/*
 +	 * If the user-supplied value of %rip is not a canonical
@@ -31,6 +34,4 @@
 +		ksi.ksi_addr = (void *)td->td_frame->tf_rip;
 +		trapsignal(td, &ksi);
 +	}
- 	if (orig_tf_rflags & PSL_T) {
- 		frame->tf_rflags &= ~PSL_T;
- 		ksiginfo_init_trap(&ksi);
+ }